From aa2e0ed051b16d243317462ad491eb344267211f Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:00:29 -0500 Subject: [PATCH 01/30] acl: Finish bin merge Signed-off-by: Reilly Brogan --- packages/a/acl/package.yml | 12 +----------- packages/a/acl/pspec_x86_64.xml | 15 ++++++--------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/packages/a/acl/package.yml b/packages/a/acl/package.yml index 6885bd254ca..382fa194f1b 100644 --- a/packages/a/acl/package.yml +++ b/packages/a/acl/package.yml @@ -1,6 +1,6 @@ name : acl version : 2.3.2 -release : 18 +release : 19 source : - http://download.savannah.nongnu.org/releases/acl/acl-2.3.2.tar.gz : 5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c homepage : https://www.gnu.org.ua/software/pies/manual/ACL.html @@ -25,13 +25,3 @@ install : | %make_install rm $installdir/%libdir%/*.la %make clean - - if [[ ! -z "${EMUL32BUILD}" ]]; then - # Install compat links T10615 - install -D -d -m 00755 $installdir/bin - pushd $installdir/usr/bin - for FILE in *; do - ln -srv $installdir/usr/bin/$FILE $installdir/bin/$FILE - done - popd - fi diff --git a/packages/a/acl/pspec_x86_64.xml b/packages/a/acl/pspec_x86_64.xml index 585343adbfc..05dedaeba21 100644 --- a/packages/a/acl/pspec_x86_64.xml +++ b/packages/a/acl/pspec_x86_64.xml @@ -20,9 +20,6 @@ system.base - /bin/chacl - /bin/getfacl - /bin/setfacl /usr/bin/chacl /usr/bin/getfacl /usr/bin/setfacl @@ -55,7 +52,7 @@ emul32 - acl + acl /usr/lib32/libacl.so.1 @@ -69,8 +66,8 @@ programming.devel - acl-devel - acl-32bit + acl-devel + acl-32bit /usr/lib32/libacl.a @@ -85,7 +82,7 @@ programming.devel - acl + acl /usr/include/acl/libacl.h @@ -135,8 +132,8 @@ - - 2024-04-23 + + 2024-05-05 2.3.2 Packaging update Reilly Brogan From 1d9e764a249af80c650973d50adee42105ef10c6 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:01:18 -0500 Subject: [PATCH 02/30] attr: Finish bin merge Signed-off-by: Reilly Brogan --- packages/a/attr/package.yml | 12 +----------- packages/a/attr/pspec_x86_64.xml | 15 ++++++--------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/packages/a/attr/package.yml b/packages/a/attr/package.yml index 0a6d38c54ef..72570f47898 100644 --- a/packages/a/attr/package.yml +++ b/packages/a/attr/package.yml @@ -1,6 +1,6 @@ name : attr version : 2.5.2 -release : 19 +release : 20 source : - https://download.savannah.gnu.org/releases/attr/attr-2.5.2.tar.gz : 39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87 homepage : https://savannah.nongnu.org/projects/attr/ @@ -28,13 +28,3 @@ install : | mv $installdir/etc/xattr.conf $installdir/usr/share/defaults/etc/attr/ rmdir -v $installdir/etc rm -rfv $installdir/usr/share/doc - - if [[ -z "${EMUL32BUILD}" ]]; then - # Install compat links T10615 - install -D -d -m 00755 $installdir/bin - pushd $installdir/usr/bin - for FILE in *; do - ln -srv $installdir/usr/bin/$FILE $installdir/bin/$FILE - done - popd - fi diff --git a/packages/a/attr/pspec_x86_64.xml b/packages/a/attr/pspec_x86_64.xml index 567dc4938ee..89829f3c710 100644 --- a/packages/a/attr/pspec_x86_64.xml +++ b/packages/a/attr/pspec_x86_64.xml @@ -21,9 +21,6 @@ system.base - /bin/attr - /bin/getfattr - /bin/setfattr /usr/bin/attr /usr/bin/getfattr /usr/bin/setfattr @@ -53,7 +50,7 @@ emul32 - attr + attr /usr/lib32/libattr.so.1 @@ -67,8 +64,8 @@ programming.devel - attr-32bit - attr-devel + attr-devel + attr-32bit /usr/lib32/libattr.a @@ -83,7 +80,7 @@ programming.devel - attr + attr /usr/include/attr/attributes.h @@ -105,8 +102,8 @@ - - 2024-04-26 + + 2024-05-05 2.5.2 Packaging update Reilly Brogan From 4cdfa5cb79d6a4de8fc98bb02b765c3f1c3fbf10 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:02:29 -0500 Subject: [PATCH 03/30] audit: Finish bin merge Signed-off-by: Reilly Brogan --- packages/a/audit/package.yml | 12 +----------- packages/a/audit/pspec_x86_64.xml | 18 +++--------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/packages/a/audit/package.yml b/packages/a/audit/package.yml index f4c06782d4d..2c2d8f91ac6 100644 --- a/packages/a/audit/package.yml +++ b/packages/a/audit/package.yml @@ -1,6 +1,6 @@ name : audit version : 4.0.1 -release : 16 +release : 17 source : - https://github.com/linux-audit/audit-userspace/archive/refs/tags/v4.0.1.tar.gz : f964610dc0c1e68075d5ae4b14d6280d1164b6eca3a4a13721d1a711681403d9 homepage : https://people.redhat.com/sgrubb/audit/ @@ -36,13 +36,3 @@ install : | rmdir $installdir/etc/audit/plugins.d \ $installdir/etc/audit \ $installdir/etc - - # Install compat links for usr-merge - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done diff --git a/packages/a/audit/pspec_x86_64.xml b/packages/a/audit/pspec_x86_64.xml index ac8e77a0562..07e6aec84aa 100644 --- a/packages/a/audit/pspec_x86_64.xml +++ b/packages/a/audit/pspec_x86_64.xml @@ -21,18 +21,6 @@ system.base - /bin/aulast - /bin/aulastlog - /bin/ausyscall - /sbin/audisp-af_unix - /sbin/audisp-filter - /sbin/audisp-remote - /sbin/audisp-syslog - /sbin/auditctl - /sbin/auditd - /sbin/augenrules - /sbin/aureport - /sbin/ausearch /usr/bin/aulast /usr/bin/aulastlog /usr/bin/ausyscall @@ -123,7 +111,7 @@ programming.devel - audit + audit /usr/include/audit-records.h @@ -233,8 +221,8 @@ - - 2024-04-26 + + 2024-05-05 4.0.1 Packaging update Reilly Brogan From 8e0f62b8469d7680fb3718db91e7eca4a5cabbab Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:04:01 -0500 Subject: [PATCH 04/30] bash: Finish bin merge Signed-off-by: Reilly Brogan --- packages/b/bash/package.yml | 7 +------ packages/b/bash/pspec_x86_64.xml | 16 +++++++--------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/packages/b/bash/package.yml b/packages/b/bash/package.yml index b7ee24673ce..e6cc08a52f4 100644 --- a/packages/b/bash/package.yml +++ b/packages/b/bash/package.yml @@ -1,6 +1,6 @@ name : bash version : 5.2.26 -release : 72 +release : 73 source : - https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz : c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 license : @@ -38,13 +38,8 @@ install : | # These are useless rm -rfv $installdir/usr/lib64/bash/Makefile.* - # usr-merge - install -dm00755 $installdir/bin - ln -srv $installdir/usr/bin/bash $installdir/bin/bash - # Bash as system shell ln -srv $installdir/usr/bin/bash $installdir/usr/bin/sh - ln -srv $installdir/usr/bin/bash $installdir/bin/sh install -D -d $installdir/usr/share/defaults/etc/profile.d install -m 0644 $pkgfiles/profile/*.sh $installdir/usr/share/defaults/etc/profile.d/. diff --git a/packages/b/bash/pspec_x86_64.xml b/packages/b/bash/pspec_x86_64.xml index 6a1a15a9bba..935d376aefa 100644 --- a/packages/b/bash/pspec_x86_64.xml +++ b/packages/b/bash/pspec_x86_64.xml @@ -3,8 +3,8 @@ bash https://www.gnu.org/software/bash - Joey Riches - josephriches@gmail.com + Reilly Brogan + solus@reillybrogan.com GPL-3.0-or-later system.base @@ -20,8 +20,6 @@ system.base - /bin/bash - /bin/sh /usr/bin/bash /usr/bin/bashbug /usr/bin/sh @@ -133,7 +131,7 @@ programming.devel - bash + bash /usr/include/bash/alias.h @@ -199,12 +197,12 @@ - - 2024-04-29 + + 2024-05-05 5.2.26 Packaging update - Joey Riches - josephriches@gmail.com + Reilly Brogan + solus@reillybrogan.com \ No newline at end of file From d3d2967bbe45d99ace947bb3b8dbb5cce44e1bcc Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:05:58 -0500 Subject: [PATCH 05/30] bzip2: Finish bin merge Signed-off-by: Reilly Brogan --- packages/b/bzip2/package.yml | 11 ++--------- packages/b/bzip2/pspec_x86_64.xml | 23 ++++++----------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/packages/b/bzip2/package.yml b/packages/b/bzip2/package.yml index 7e4d0e7742b..fbaec45bcaa 100644 --- a/packages/b/bzip2/package.yml +++ b/packages/b/bzip2/package.yml @@ -1,6 +1,6 @@ name : bzip2 version : 1.0.8 -release : 18 +release : 19 source : - https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz : ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 homepage : http://www.bzip.org @@ -40,16 +40,9 @@ install : | ln -sf bzip2 $installdir/usr/bin/bunzip2 ln -sf bzip2 $installdir/usr/bin/bzcat sed "s|@ARCH@|64|" -i $installdir/%libdir%/pkgconfig/bzip2.pc - - # Usr-merge - install -D -d -m 00755 $installdir/bin - pushd $installdir/usr/bin - for FILE in *; do - ln -srv $installdir/usr/bin/$FILE $installdir/bin/$FILE - done else sed "s|@ARCH@|32|" -i $installdir/%libdir%/pkgconfig/bzip2.pc - rm -rf $installdir/{usr/bin,bin} + rm -rfv $installdir/{usr/bin,bin} fi # no static diff --git a/packages/b/bzip2/pspec_x86_64.xml b/packages/b/bzip2/pspec_x86_64.xml index ad5c4499174..2f5457a8d9d 100644 --- a/packages/b/bzip2/pspec_x86_64.xml +++ b/packages/b/bzip2/pspec_x86_64.xml @@ -20,17 +20,6 @@ system.base - /bin/bunzip2 - /bin/bzcat - /bin/bzcmp - /bin/bzdiff - /bin/bzegrep - /bin/bzfgrep - /bin/bzgrep - /bin/bzip2 - /bin/bzip2recover - /bin/bzless - /bin/bzmore /usr/bin/bunzip2 /usr/bin/bzcat /usr/bin/bzcmp @@ -66,7 +55,7 @@ emul32 - bzip2 + bzip2 /usr/lib32/libbz2.so.1 @@ -81,8 +70,8 @@ programming.devel - bzip2-32bit - bzip2-devel + bzip2-32bit + bzip2-devel /usr/lib32/libbz2.so @@ -96,7 +85,7 @@ programming.devel - bzip2 + bzip2 /usr/include/bzlib.h @@ -105,8 +94,8 @@ - - 2024-04-23 + + 2024-05-05 1.0.8 Packaging update Reilly Brogan From 667eac14585a793b85d1c4816e9fad907e0a5ec5 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:06:48 -0500 Subject: [PATCH 06/30] cifs-utils: Finish bin merge Signed-off-by: Reilly Brogan --- packages/c/cifs-utils/package.yml | 12 +----------- packages/c/cifs-utils/pspec_x86_64.xml | 15 +++------------ 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/packages/c/cifs-utils/package.yml b/packages/c/cifs-utils/package.yml index dd07562bccd..891d7dae159 100644 --- a/packages/c/cifs-utils/package.yml +++ b/packages/c/cifs-utils/package.yml @@ -1,6 +1,6 @@ name : cifs-utils version : '7.0' -release : 16 +release : 17 source : - https://www.samba.org/ftp/linux-cifs/cifs-utils/cifs-utils-7.0.tar.bz2 : 0defaab85bd3ea46ffc45ab41fb0d0ad54d05ae2cfaa7e503de86d4f12bc8161 homepage : https://wiki.samba.org/index.php/LinuxCIFS_utils @@ -22,13 +22,3 @@ build : | %make install : | %make_install ROOTSBINDIR=/usr/sbin - - # usr-merge - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done diff --git a/packages/c/cifs-utils/pspec_x86_64.xml b/packages/c/cifs-utils/pspec_x86_64.xml index 21483251f59..ffd51e85543 100644 --- a/packages/c/cifs-utils/pspec_x86_64.xml +++ b/packages/c/cifs-utils/pspec_x86_64.xml @@ -20,15 +20,6 @@ network.utils - /bin/cifscreds - /bin/getcifsacl - /bin/setcifsacl - /bin/smb2-quota - /bin/smbinfo - /sbin/cifs.idmap - /sbin/cifs.upcall - /sbin/mount.cifs - /sbin/mount.smb3 /usr/bin/cifscreds /usr/bin/getcifsacl /usr/bin/setcifsacl @@ -60,15 +51,15 @@ programming.devel - cifs-utils + cifs-utils /usr/include/cifsidmap.h - - 2024-04-26 + + 2024-05-05 7.0 Packaging update Reilly Brogan From 3de25976e06e13a0268df631c29d67e034313229 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:09:45 -0500 Subject: [PATCH 07/30] coreutils: Finish bin merge Signed-off-by: Reilly Brogan --- packages/c/coreutils/package.yml | 11 +------- packages/c/coreutils/pspec_x86_64.xml | 39 ++------------------------- 2 files changed, 3 insertions(+), 47 deletions(-) diff --git a/packages/c/coreutils/package.yml b/packages/c/coreutils/package.yml index 33162b8e3d9..b1637ce04ba 100644 --- a/packages/c/coreutils/package.yml +++ b/packages/c/coreutils/package.yml @@ -1,6 +1,6 @@ name : coreutils version : '9.5' -release : 35 +release : 36 source : - https://ftp.gnu.org/gnu/coreutils/coreutils-9.5.tar.xz : cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a homepage : https://www.gnu.org/software/coreutils/ @@ -30,15 +30,6 @@ build : | %make install : | %make_install - - install -Ddm00755 $installdir/bin - # usrmerge is clearly not complete. - for binary in basename cat chgrp chmod chown cp cut date dd df \ - dir echo env false link ln ls mkdir mknod mktemp mv \ - nice pwd readlink rm rmdir sleep sort stty sync touch \ - true uname unlink vdir; do \ - ln -srv $installdir/usr/bin/$binary $installdir/bin/$binary - done check : | # Breaks several tests, and the test suite for coreutils is generally well-behaved. Disable fakeroot unset LD_PRELOAD diff --git a/packages/c/coreutils/pspec_x86_64.xml b/packages/c/coreutils/pspec_x86_64.xml index c3a0adb420a..edbdad1310a 100644 --- a/packages/c/coreutils/pspec_x86_64.xml +++ b/packages/c/coreutils/pspec_x86_64.xml @@ -20,41 +20,6 @@ system.base - /bin/basename - /bin/cat - /bin/chgrp - /bin/chmod - /bin/chown - /bin/cp - /bin/cut - /bin/date - /bin/dd - /bin/df - /bin/dir - /bin/echo - /bin/env - /bin/false - /bin/link - /bin/ln - /bin/ls - /bin/mkdir - /bin/mknod - /bin/mktemp - /bin/mv - /bin/nice - /bin/pwd - /bin/readlink - /bin/rm - /bin/rmdir - /bin/sleep - /bin/sort - /bin/stty - /bin/sync - /bin/touch - /bin/true - /bin/uname - /bin/unlink - /bin/vdir /usr/bin/[ /usr/bin/b2sum /usr/bin/base32 @@ -357,8 +322,8 @@ - - 2024-04-23 + + 2024-05-05 9.5 Packaging update Reilly Brogan From 1e1b9ee0c29ec877de93653a6332aaa8a096ecef Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:12:03 -0500 Subject: [PATCH 08/30] cpio: Finish bin merge Signed-off-by: Reilly Brogan --- packages/c/cpio/package.yml | 9 +-------- packages/c/cpio/pspec_x86_64.xml | 6 ++---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/c/cpio/package.yml b/packages/c/cpio/package.yml index 0f287dd0e95..9e3028529a5 100644 --- a/packages/c/cpio/package.yml +++ b/packages/c/cpio/package.yml @@ -1,6 +1,6 @@ name : cpio version : '2.15' -release : 16 +release : 17 source : - https://ftp.gnu.org/gnu/cpio/cpio-2.15.tar.gz : efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee4183455499e homepage : https://savannah.gnu.org/projects/cpio/ @@ -21,10 +21,3 @@ install : | %make_install # They don't have a man8 file. Remove directory. rmdir $installdir/usr/share/man/man8 - - # Usr-merge - install -D -d -m 00755 $installdir/bin - pushd $installdir/usr/bin - for FILE in *; do - ln -srv $installdir/usr/bin/$FILE $installdir/bin/$FILE - done diff --git a/packages/c/cpio/pspec_x86_64.xml b/packages/c/cpio/pspec_x86_64.xml index d0b47507eaa..e0459bb6ef2 100644 --- a/packages/c/cpio/pspec_x86_64.xml +++ b/packages/c/cpio/pspec_x86_64.xml @@ -20,8 +20,6 @@ system.base - /bin/cpio - /bin/mt /usr/bin/cpio /usr/bin/mt /usr/share/info/cpio.info @@ -58,8 +56,8 @@ - - 2024-04-23 + + 2024-05-05 2.15 Packaging update Reilly Brogan From b61634107c22c56751589b5c9572dbe490af42e9 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:19:31 -0500 Subject: [PATCH 09/30] apparmor: Finish bin merge Signed-off-by: Reilly Brogan --- packages/a/apparmor/package.yml | 8 +++----- packages/a/apparmor/pspec_x86_64.xml | 7 +++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/a/apparmor/package.yml b/packages/a/apparmor/package.yml index 68f782868c2..e1a05c3507a 100644 --- a/packages/a/apparmor/package.yml +++ b/packages/a/apparmor/package.yml @@ -1,6 +1,6 @@ name : apparmor version : 3.1.7 -release : 27 +release : 28 source : # TODO replace this with the launchpad tar and switch back to configure when they upload it - https://gitlab.com/apparmor/apparmor/-/archive/v3.1.7/apparmor-v3.1.7.tar.gz : 64494bd99fa6547a9cbdb4fc6bc732451a02dd19e6eb70eab977b239632151eb @@ -41,11 +41,11 @@ install : | # TODO: Validate profiles, tools, etc, and make stateless! %make_install -C libraries/libapparmor %make_install -C binutils - %make_install -C parser + %make_install -C parser SBINDIR=$installdir/usr/sbin %make_install -C profiles %make_install -C utils %make_install -C changehat/pam_apparmor - %make_install -C parser install-systemd + %make_install -C parser install-systemd SBINDIR=$installdir/usr/sbin # Enable apparmor service by default install -dm00755 $installdir/usr/lib/systemd/system/multi-user.target.wants @@ -67,8 +67,6 @@ install : | mv $installdir/lib/apparmor $installdir/usr/lib64/ mv $installdir/lib/security $installdir/usr/lib64/ ln -srv $installdir/usr/lib64/apparmor $installdir/lib/apparmor - mv $installdir/sbin/apparmor_parser $installdir/usr/sbin/apparmor_parser - ln -srv $installdir/usr/sbin/apparmor_parser $installdir/sbin/apparmor_parser # Stateless rmdir $installdir/var/lib/apparmor diff --git a/packages/a/apparmor/pspec_x86_64.xml b/packages/a/apparmor/pspec_x86_64.xml index 5b734b3f393..3dc939f0e6a 100644 --- a/packages/a/apparmor/pspec_x86_64.xml +++ b/packages/a/apparmor/pspec_x86_64.xml @@ -222,7 +222,6 @@ /etc/apparmor/parser.conf /etc/apparmor/severity.db /lib/apparmor - /sbin/apparmor_parser /usr/bin/aa-easyprof /usr/bin/aa-enabled /usr/bin/aa-exec @@ -584,7 +583,7 @@ programming.devel - apparmor + apparmor /usr/include/aalogparse/aalogparse.h @@ -600,8 +599,8 @@ - - 2024-04-23 + + 2024-05-05 3.1.7 Packaging update Reilly Brogan From 03e134c01a6940ffb1417ab129f86648e697856c Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:20:16 -0500 Subject: [PATCH 10/30] dash: Finish bin merge Signed-off-by: Reilly Brogan --- packages/d/dash/package.yml | 6 ++---- packages/d/dash/pspec_x86_64.xml | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/d/dash/package.yml b/packages/d/dash/package.yml index 65a13c4f4ea..46dd4d36f3d 100644 --- a/packages/d/dash/package.yml +++ b/packages/d/dash/package.yml @@ -1,6 +1,6 @@ name : dash version : 0.5.12 -release : 11 +release : 12 source : - http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.12.tar.gz : 6a474ac46e8b0b32916c4c60df694c82058d3297d8b385b74508030ca4a8f28a homepage : http://gondor.apana.org.au/~herbert/dash/ @@ -18,7 +18,5 @@ setup : | %configure --with-libedit build : | %make -install : |- +install : | %make_install - install -dm00755 $installdir/bin - ln -srv $installdir/usr/bin/dash $installdir/bin/dash diff --git a/packages/d/dash/pspec_x86_64.xml b/packages/d/dash/pspec_x86_64.xml index e05a7eebb4b..9357d515313 100644 --- a/packages/d/dash/pspec_x86_64.xml +++ b/packages/d/dash/pspec_x86_64.xml @@ -20,14 +20,13 @@ system.utils - /bin/dash /usr/bin/dash /usr/share/man/man1/dash.1 - - 2024-04-26 + + 2024-05-05 0.5.12 Packaging update Reilly Brogan From 4377ae3662fdc2e4001e35c542212da819249fa3 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:21:02 -0500 Subject: [PATCH 11/30] davfs2: Finish bin merge Signed-off-by: Reilly Brogan --- packages/d/davfs2/package.yml | 10 +--------- packages/d/davfs2/pspec_x86_64.xml | 6 ++---- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/d/davfs2/package.yml b/packages/d/davfs2/package.yml index d96b75728e7..78ef44d8196 100644 --- a/packages/d/davfs2/package.yml +++ b/packages/d/davfs2/package.yml @@ -1,6 +1,6 @@ name : davfs2 version : 1.7.0 -release : 7 +release : 8 source : - https://de.freedif.org/savannah/davfs2/davfs2-1.7.0.tar.gz : 251db75a27380cca1330b1b971700c5e5dcc0c90e5a47622285f0140edfe3a2f homepage : https://savannah.nongnu.org/p/davfs2 @@ -27,11 +27,3 @@ install : | install -Dm00644 $pkgfiles/davfs2.sysusers $installdir/%libdir%/sysusers.d/davfs2.conf install -Dm00644 $pkgfiles/davfs2.tmpfiles $installdir/%libdir%/tmpfiles.d/davfs2.conf - - # usr-merge - install -D -d -m 00755 $installdir/sbin - pushd $installdir/usr/sbin - for FILE in *; do - ln -srv $installdir/usr/sbin/$FILE $installdir/sbin/$FILE - done - popd diff --git a/packages/d/davfs2/pspec_x86_64.xml b/packages/d/davfs2/pspec_x86_64.xml index a965cf3c48b..8accad981ad 100644 --- a/packages/d/davfs2/pspec_x86_64.xml +++ b/packages/d/davfs2/pspec_x86_64.xml @@ -31,8 +31,6 @@ with the file system as usual. /etc/davfs2/certs/private /etc/davfs2/davfs2.conf /etc/davfs2/secrets - /sbin/mount.davfs - /sbin/umount.davfs /usr/lib64/sysusers.d/davfs2.conf /usr/lib64/tmpfiles.d/davfs2.conf /usr/sbin/mount.davfs @@ -51,8 +49,8 @@ with the file system as usual. - - 2024-04-26 + + 2024-05-05 1.7.0 Packaging update Reilly Brogan From a90a9c82cbb02a2c08ae6c122a27d7b0f72b35fe Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:22:35 -0500 Subject: [PATCH 12/30] e2fsprogs: Finish bin merge Signed-off-by: Reilly Brogan --- packages/e/e2fsprogs/package.yml | 12 +------- packages/e/e2fsprogs/pspec_x86_64.xml | 41 ++++----------------------- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/packages/e/e2fsprogs/package.yml b/packages/e/e2fsprogs/package.yml index 39e7e41d1bf..f236b50f3ba 100644 --- a/packages/e/e2fsprogs/package.yml +++ b/packages/e/e2fsprogs/package.yml @@ -1,6 +1,6 @@ name : e2fsprogs version : 1.47.0 -release : 24 +release : 25 source : - https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.0/e2fsprogs-1.47.0.tar.xz : 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db homepage : http://e2fsprogs.sourceforge.net @@ -46,16 +46,6 @@ install : | # Stateless rm -v $installdir/etc/e2scrub.conf rmdir -v $installdir/etc - - # Install compat links for usr-merge - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done check : | # Remove mmp since it fails on build server rm -rf tests/*mmp* diff --git a/packages/e/e2fsprogs/pspec_x86_64.xml b/packages/e/e2fsprogs/pspec_x86_64.xml index 071b9a15fca..346a2ba4c3e 100644 --- a/packages/e/e2fsprogs/pspec_x86_64.xml +++ b/packages/e/e2fsprogs/pspec_x86_64.xml @@ -23,35 +23,6 @@ system.base - /bin/chattr - /bin/compile_et - /bin/lsattr - /bin/mk_cmds - /sbin/badblocks - /sbin/debugfs - /sbin/dumpe2fs - /sbin/e2freefrag - /sbin/e2fsck - /sbin/e2image - /sbin/e2label - /sbin/e2mmpstatus - /sbin/e2scrub - /sbin/e2scrub_all - /sbin/e2undo - /sbin/e4crypt - /sbin/e4defrag - /sbin/filefrag - /sbin/fsck.ext2 - /sbin/fsck.ext3 - /sbin/fsck.ext4 - /sbin/logsave - /sbin/mke2fs - /sbin/mkfs.ext2 - /sbin/mkfs.ext3 - /sbin/mkfs.ext4 - /sbin/mklost+found - /sbin/resize2fs - /sbin/tune2fs /usr/bin/chattr /usr/bin/compile_et /usr/bin/lsattr @@ -168,7 +139,7 @@ emul32 - e2fsprogs + e2fsprogs /usr/lib32/libcom_err.so.2 @@ -188,8 +159,8 @@ programming.devel - e2fsprogs-32bit - e2fsprogs-devel + e2fsprogs-32bit + e2fsprogs-devel /usr/lib32/libcom_err.a @@ -213,7 +184,7 @@ programming.devel - e2fsprogs + e2fsprogs /usr/include/com_err.h @@ -248,8 +219,8 @@ - - 2024-04-23 + + 2024-05-05 1.47.0 Packaging update Reilly Brogan From b0c1942ec9ebee8531dd93ecab74aff1fe74743d Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:23:40 -0500 Subject: [PATCH 13/30] fuse2: Finish bin merge Signed-off-by: Reilly Brogan --- packages/f/fuse2/package.yml | 8 ++------ packages/f/fuse2/pspec_x86_64.xml | 7 +++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/packages/f/fuse2/package.yml b/packages/f/fuse2/package.yml index 9ffb69d0bed..8459678a709 100644 --- a/packages/f/fuse2/package.yml +++ b/packages/f/fuse2/package.yml @@ -1,6 +1,6 @@ name : fuse2 version : 2.9.9 -release : 20 +release : 21 source : - https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz : d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 license : LGPL-2.0-only @@ -13,7 +13,7 @@ builddeps : - gettext-devel rundeps : - fuse-common -environment: +environment: | export UDEV_RULES_PATH=%libdir%/udev/rules.d setup : | sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in @@ -28,9 +28,5 @@ build : | install : | %make_install - # Install compat links for /usr/merge - install -D -d -m 00755 $installdir/sbin - ln -srv $installdir/usr/sbin/mount.fuse $installdir/sbin/mount.fuse - rm -rfv $installdir/dev rm -rfv $installdir/etc/ diff --git a/packages/f/fuse2/pspec_x86_64.xml b/packages/f/fuse2/pspec_x86_64.xml index bcc5c76bacc..406168d146d 100644 --- a/packages/f/fuse2/pspec_x86_64.xml +++ b/packages/f/fuse2/pspec_x86_64.xml @@ -20,7 +20,6 @@ system.utils - /sbin/mount.fuse /usr/bin/fusermount /usr/bin/ulockmgr_server /usr/lib64/libfuse.so.2 @@ -41,7 +40,7 @@ programming.devel - fuse2 + fuse2 /usr/include/fuse.h @@ -60,8 +59,8 @@ - - 2024-04-26 + + 2024-05-05 2.9.9 Packaging update Reilly Brogan From 8b8ac70578e82ac5eebc1fe5cc6334d90b7ba203 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:29:54 -0500 Subject: [PATCH 14/30] glibc: Finish bin merge Signed-off-by: Reilly Brogan --- packages/g/glibc/package.yml | 5 +---- packages/g/glibc/pspec_x86_64.xml | 14 ++++++-------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/packages/g/glibc/package.yml b/packages/g/glibc/package.yml index ceede8efcf5..27719c63e7a 100644 --- a/packages/g/glibc/package.yml +++ b/packages/g/glibc/package.yml @@ -1,6 +1,6 @@ name : glibc version : '2.39' -release : 109 +release : 110 source : # release/2.39/master - git|git://sourceware.org/git/glibc.git : 273a835fe7c685cc54266bb8b502787bad5e9bae @@ -202,9 +202,6 @@ install : | # usr-merge install -dm00755 $installdir/lib64 ln -srv $installdir/usr/lib64/ld-linux-x86-64.so.2 $installdir/lib64/ld-linux-x86-64.so.2 - install -dm00755 $installdir/sbin - ln -srv $installdir/usr/sbin/ldconfig $installdir/sbin/ldconfig - ln -srv $installdir/usr/sbin/sln $installdir/sbin/sln # This is a vendored copy from the 5.0 systemtap package, it should be kept in sync with the systemtap version install -Dm00644 $pkgfiles/systemtap/{sdt.h,sdt-config.h} -t $installdir/usr/include/sys diff --git a/packages/g/glibc/pspec_x86_64.xml b/packages/g/glibc/pspec_x86_64.xml index cb70f1a9d74..3a59801b1ac 100644 --- a/packages/g/glibc/pspec_x86_64.xml +++ b/packages/g/glibc/pspec_x86_64.xml @@ -21,8 +21,6 @@ system.base /lib64/ld-linux-x86-64.so.2 - /sbin/ldconfig - /sbin/sln /usr/bin/gencat /usr/bin/getconf /usr/bin/getent @@ -6976,7 +6974,7 @@ emul32 - glibc + glibc /lib/ld-linux.so.2 @@ -7285,8 +7283,8 @@ programming.devel - glibc-devel - glibc-32bit + glibc-32bit + glibc-devel /usr/lib32/libBrokenLocale.a @@ -7734,7 +7732,7 @@ system.devel - glibc + glibc /usr/include/a.out.h @@ -8235,8 +8233,8 @@ - - 2024-05-03 + + 2024-05-05 2.39 Packaging update Reilly Brogan From 34d6a36ad9e3efcd01c97283f22539a1c0a47895 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:31:44 -0500 Subject: [PATCH 15/30] grep: Finish bin merge Signed-off-by: Reilly Brogan --- packages/g/grep/package.yml | 8 +------- packages/g/grep/pspec_x86_64.xml | 7 ++----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/g/grep/package.yml b/packages/g/grep/package.yml index ea3f6b3d048..5bee0055973 100644 --- a/packages/g/grep/package.yml +++ b/packages/g/grep/package.yml @@ -1,6 +1,6 @@ name : grep version : '3.11' -release : 19 +release : 20 source : - https://ftp.gnu.org/gnu/grep/grep-3.11.tar.gz : 1f31014953e71c3cddcedb97692ad7620cb9d6d04fbdc19e0d8dd836f87622bb homepage : https://www.gnu.org/software/grep/ @@ -17,11 +17,5 @@ build : | %make install : | %make_install - install -d -m00755 ${installdir}/bin - - # usr-merge - for i in egrep fgrep grep; do - ln -srv $installdir/usr/bin/$i ${installdir}/bin/$i - done check : | %make check diff --git a/packages/g/grep/pspec_x86_64.xml b/packages/g/grep/pspec_x86_64.xml index c91458491e8..86d9c11c989 100644 --- a/packages/g/grep/pspec_x86_64.xml +++ b/packages/g/grep/pspec_x86_64.xml @@ -20,9 +20,6 @@ system.base - /bin/egrep - /bin/fgrep - /bin/grep /usr/bin/egrep /usr/bin/fgrep /usr/bin/grep @@ -76,8 +73,8 @@ - - 2024-04-23 + + 2024-05-05 3.11 Packaging update Reilly Brogan From cde3e91eb6f4d235c1a5bc8a561cfc05b3d8493f Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:32:38 -0500 Subject: [PATCH 16/30] iproute2: Finish bin merge Signed-off-by: Reilly Brogan --- packages/i/iproute2/package.yml | 10 +--------- packages/i/iproute2/pspec_x86_64.xml | 20 +++----------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/packages/i/iproute2/package.yml b/packages/i/iproute2/package.yml index 43168bddfaf..9290256d152 100644 --- a/packages/i/iproute2/package.yml +++ b/packages/i/iproute2/package.yml @@ -1,7 +1,7 @@ name : iproute2 homepage : https://github.com/shemminger/iproute2 version : 6.8.0 -release : 22 +release : 23 source : - https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.8.0.tar.gz : 0b7c03442395efdfb1149e53655229b50abad36cc46fbe533d49ca6591a3972d license : GPL-2.0-only @@ -24,12 +24,4 @@ install : | %make_install SBINDIR="/usr/sbin" install -D -m 00644 $pkgfiles/iproute2.tmpfiles $installdir/%libdir%/iproute2.tmpfiles - # usr-merge - install -D -d -m 00755 $installdir/sbin - pushd $installdir/usr/sbin - for FILE in *; do - ln -srv $installdir/usr/sbin/$FILE $installdir/sbin/$FILE - done - popd - rm -rfv $installdir/var diff --git a/packages/i/iproute2/pspec_x86_64.xml b/packages/i/iproute2/pspec_x86_64.xml index eaf74f02db6..f9fe304eaa2 100644 --- a/packages/i/iproute2/pspec_x86_64.xml +++ b/packages/i/iproute2/pspec_x86_64.xml @@ -28,20 +28,6 @@ iproute2 is usually shipped in a package called iproute or iproute2 and consists network.base - /sbin/arpd - /sbin/bridge - /sbin/ctstat - /sbin/genl - /sbin/ifstat - /sbin/ip - /sbin/lnstat - /sbin/nstat - /sbin/routel - /sbin/rtacct - /sbin/rtmon - /sbin/rtstat - /sbin/ss - /sbin/tc /usr/lib64/iproute2.tmpfiles /usr/lib64/tc/experimental.dist /usr/lib64/tc/normal.dist @@ -219,7 +205,7 @@ iproute2 is usually shipped in a package called iproute or iproute2 and consists programming.devel - iproute2 + iproute2 /usr/include/iproute2/bpf_elf.h @@ -227,8 +213,8 @@ iproute2 is usually shipped in a package called iproute or iproute2 and consists - - 2024-04-23 + + 2024-05-05 6.8.0 Packaging update Reilly Brogan From 2609a2a5f484d0f7128c5f72fe658ee58ace4fd2 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:34:30 -0500 Subject: [PATCH 17/30] iptables: Finish bin merge Signed-off-by: Reilly Brogan --- packages/i/iptables/package.yml | 12 +------ packages/i/iptables/pspec_x86_64.xml | 54 ++++------------------------ 2 files changed, 7 insertions(+), 59 deletions(-) diff --git a/packages/i/iptables/package.yml b/packages/i/iptables/package.yml index a6132bd7a70..47b00a69e98 100644 --- a/packages/i/iptables/package.yml +++ b/packages/i/iptables/package.yml @@ -1,6 +1,6 @@ name : iptables version : 1.8.10 -release : 13 +release : 14 source : - https://www.netfilter.org/pub/iptables/iptables-1.8.10.tar.xz : 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c homepage : https://www.netfilter.org @@ -52,16 +52,6 @@ install : | ln -svf xtables-nft-multi "$installdir/usr/sbin/$_x" done ln -srvf $installdir/usr/sbin/xtables-nft-multi "$installdir/usr/bin/iptables-xml" - - # usr-merge for /bin and /sbin - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done fi patterns : - 32bit : /lib32 diff --git a/packages/i/iptables/pspec_x86_64.xml b/packages/i/iptables/pspec_x86_64.xml index 297a1368a27..1f92d535538 100644 --- a/packages/i/iptables/pspec_x86_64.xml +++ b/packages/i/iptables/pspec_x86_64.xml @@ -20,49 +20,7 @@ network.base - /bin/iptables-xml /lib64/xtables - /sbin/arptables - /sbin/arptables-nft - /sbin/arptables-nft-restore - /sbin/arptables-nft-save - /sbin/arptables-restore - /sbin/arptables-save - /sbin/ebtables - /sbin/ebtables-nft - /sbin/ebtables-nft-restore - /sbin/ebtables-nft-save - /sbin/ebtables-restore - /sbin/ebtables-save - /sbin/ebtables-translate - /sbin/ip6tables - /sbin/ip6tables-apply - /sbin/ip6tables-legacy - /sbin/ip6tables-legacy-restore - /sbin/ip6tables-legacy-save - /sbin/ip6tables-nft - /sbin/ip6tables-nft-restore - /sbin/ip6tables-nft-save - /sbin/ip6tables-restore - /sbin/ip6tables-restore-translate - /sbin/ip6tables-save - /sbin/ip6tables-translate - /sbin/iptables - /sbin/iptables-apply - /sbin/iptables-legacy - /sbin/iptables-legacy-restore - /sbin/iptables-legacy-save - /sbin/iptables-nft - /sbin/iptables-nft-restore - /sbin/iptables-nft-save - /sbin/iptables-restore - /sbin/iptables-restore-translate - /sbin/iptables-save - /sbin/iptables-translate - /sbin/nfnl_osf - /sbin/xtables-legacy-multi - /sbin/xtables-monitor - /sbin/xtables-nft-multi /usr/bin/iptables-xml /usr/lib64/libip4tc.so.2 /usr/lib64/libip4tc.so.2.0.0 @@ -270,7 +228,7 @@ emul32 - iptables + iptables /lib32/xtables @@ -412,8 +370,8 @@ programming.devel - iptables-32bit - iptables-devel + iptables-devel + iptables-32bit /usr/lib32/libip4tc.so @@ -434,7 +392,7 @@ programming.devel - iptables + iptables /usr/include/libipq.h @@ -468,8 +426,8 @@ - - 2024-04-23 + + 2024-05-05 1.8.10 Packaging update Reilly Brogan From 8585a3dc532e7f98ebafd358a8936f06be149fe5 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:35:15 -0500 Subject: [PATCH 18/30] kmod: Finish bin merge Signed-off-by: Reilly Brogan --- packages/k/kmod/package.yml | 12 +----------- packages/k/kmod/pspec_x86_64.xml | 13 +++---------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/packages/k/kmod/package.yml b/packages/k/kmod/package.yml index b7a20356f3f..715967f588f 100644 --- a/packages/k/kmod/package.yml +++ b/packages/k/kmod/package.yml @@ -1,6 +1,6 @@ name : kmod version : '32' -release : 14 +release : 15 source : - https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-32.tar.xz : 630ed0d92275a88cb9a7bf68f5700e911fdadaf02e051cf2e4680ff8480bd492 component : system.base @@ -33,13 +33,3 @@ install : | rm -v $installdir/usr/bin/$target ln -srv $installdir/usr/bin/kmod $installdir/usr/sbin/${target} done - - # usr-merge - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done diff --git a/packages/k/kmod/pspec_x86_64.xml b/packages/k/kmod/pspec_x86_64.xml index 2a9a466e320..3ddabe99dab 100644 --- a/packages/k/kmod/pspec_x86_64.xml +++ b/packages/k/kmod/pspec_x86_64.xml @@ -21,13 +21,6 @@ system.base - /bin/kmod - /sbin/depmod - /sbin/insmod - /sbin/lsmod - /sbin/modinfo - /sbin/modprobe - /sbin/rmmod /usr/bin/kmod /usr/lib64/libkmod.so.2 /usr/lib64/libkmod.so.2.4.2 @@ -58,7 +51,7 @@ programming.devel - kmod + kmod /usr/include/libkmod.h @@ -68,8 +61,8 @@ - - 2024-04-23 + + 2024-05-05 32 Packaging update Reilly Brogan From 52b5b83cc7054668b1f60c2a597674230bf63aa9 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:36:34 -0500 Subject: [PATCH 19/30] mdadm: Finish bin merge Signed-off-by: Reilly Brogan --- packages/m/mdadm/package.yml | 9 +-------- packages/m/mdadm/pspec_x86_64.xml | 6 ++---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/m/mdadm/package.yml b/packages/m/mdadm/package.yml index 31275f58ff9..0bfef071a86 100644 --- a/packages/m/mdadm/package.yml +++ b/packages/m/mdadm/package.yml @@ -1,6 +1,6 @@ name : mdadm version : '4.3' -release : 7 +release : 8 source : - https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.3.tar.xz : 416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f homepage : https://git.kernel.org/pub/scm/utils/mdadm @@ -13,10 +13,3 @@ build : | %make CXFLAGS="$CFLAGS" BINDIR=/usr/sbin install : | %make_install BINDIR=/usr/sbin - - # Usr-merge - install -D -d -m 00755 $installdir/sbin - pushd $installdir/usr/sbin - for FILE in *; do - ln -srv $installdir/usr/sbin/$FILE $installdir/sbin/$FILE - done diff --git a/packages/m/mdadm/pspec_x86_64.xml b/packages/m/mdadm/pspec_x86_64.xml index 415ce59a9da..11d5e9a050e 100644 --- a/packages/m/mdadm/pspec_x86_64.xml +++ b/packages/m/mdadm/pspec_x86_64.xml @@ -20,8 +20,6 @@ system.utils - /sbin/mdadm - /sbin/mdmon /usr/lib/udev/rules.d/01-md-raid-creating.rules /usr/lib/udev/rules.d/63-md-raid-arrays.rules /usr/lib/udev/rules.d/64-md-raid-assembly.rules @@ -35,8 +33,8 @@ - - 2024-04-23 + + 2024-05-05 4.3 Packaging update Reilly Brogan From 9811c4174a711a9a263aa2e166720139ecd2ddf0 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:37:43 -0500 Subject: [PATCH 20/30] nfs-utils: Finish bin merge Signed-off-by: Reilly Brogan --- packages/n/nfs-utils/package.yml | 9 +------- packages/n/nfs-utils/pspec_x86_64.xml | 33 +++------------------------ 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/packages/n/nfs-utils/package.yml b/packages/n/nfs-utils/package.yml index e2294fadb5c..ab30a63b9c9 100644 --- a/packages/n/nfs-utils/package.yml +++ b/packages/n/nfs-utils/package.yml @@ -1,6 +1,6 @@ name : nfs-utils version : 2.6.4 -release : 22 +release : 23 source : - https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/2.6.4/nfs-utils-2.6.4.tar.gz : e41c9ac96b15b4e8b8bde05da6e072e98bcf3acd8ae8f055e4a0bd5ac2328d4c license : GPL-2.0-or-later @@ -48,13 +48,6 @@ install : | install -Dm00644 $pkgfiles/nfs-utils.tmpfiles $installdir/%libdir%/tmpfiles.d/nfs-utils.conf - # Install compat links T10615 - install -D -d -m 00755 $installdir/sbin - pushd $installdir/usr/sbin - for FILE in *; do - ln -srv $installdir/usr/sbin/$FILE $installdir/sbin/$FILE - done - # Stateless rm -v $installdir/run/nfs/etab \ $installdir/run/nfs/rmtab \ diff --git a/packages/n/nfs-utils/pspec_x86_64.xml b/packages/n/nfs-utils/pspec_x86_64.xml index 1b4b6d06a70..0fece70affc 100644 --- a/packages/n/nfs-utils/pspec_x86_64.xml +++ b/packages/n/nfs-utils/pspec_x86_64.xml @@ -20,33 +20,6 @@ network.utils - /sbin/blkmapd - /sbin/exportfs - /sbin/fsidd - /sbin/mount.nfs - /sbin/mount.nfs4 - /sbin/mountstats - /sbin/nfsconf - /sbin/nfsdcld - /sbin/nfsdclddb - /sbin/nfsdclnts - /sbin/nfsdcltrack - /sbin/nfsidmap - /sbin/nfsiostat - /sbin/nfsstat - /sbin/rpc.gssd - /sbin/rpc.idmapd - /sbin/rpc.mountd - /sbin/rpc.nfsd - /sbin/rpc.statd - /sbin/rpc.svcgssd - /sbin/rpcctl - /sbin/rpcdebug - /sbin/showmount - /sbin/sm-notify - /sbin/start-statd - /sbin/umount.nfs - /sbin/umount.nfs4 /usr/lib/systemd/system-generators/nfs-server-generator /usr/lib/systemd/system-generators/rpc-pipefs-generator /usr/lib/systemd/system/auth-rpcgss-module.service @@ -155,7 +128,7 @@ programming.devel - nfs-utils + nfs-utils /usr/include/nfsidmap.h @@ -169,8 +142,8 @@ - - 2024-04-26 + + 2024-05-05 2.6.4 Packaging update Reilly Brogan From 287df22f203b92c72041ec6c4921aa891df1215a Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:41:21 -0500 Subject: [PATCH 21/30] ntfs-3g: Finish bin merge Signed-off-by: Reilly Brogan --- packages/n/ntfs-3g/package.yml | 13 ++---------- packages/n/ntfs-3g/pspec_x86_64.xml | 31 +++-------------------------- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/packages/n/ntfs-3g/package.yml b/packages/n/ntfs-3g/package.yml index e693cb12ab2..4af6048eb03 100644 --- a/packages/n/ntfs-3g/package.yml +++ b/packages/n/ntfs-3g/package.yml @@ -1,6 +1,6 @@ name : ntfs-3g version : 2022.10.3 -release : 17 +release : 18 source : - https://tuxera.com/opensource/ntfs-3g_ntfsprogs-2022.10.3.tgz : f20e36ee68074b845e3629e6bced4706ad053804cbaf062fbae60738f854170c homepage : https://github.com/tuxera/ntfs-3g/wiki @@ -30,6 +30,7 @@ install : | # Make existing symlinks relative mv $installdir/sbin/* $installdir/usr/sbin/ + rmdir -v $installdir/sbin for TOP in {bin,sbin}; do pushd $installdir/usr/$TOP for FILE in *; do @@ -42,13 +43,3 @@ install : | done ln -srv $installdir/usr/bin/ntfs-3g $installdir/usr/sbin/mount.ntfs - - # usr-merge - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done diff --git a/packages/n/ntfs-3g/pspec_x86_64.xml b/packages/n/ntfs-3g/pspec_x86_64.xml index a5a126ae661..57c7c983bc6 100644 --- a/packages/n/ntfs-3g/pspec_x86_64.xml +++ b/packages/n/ntfs-3g/pspec_x86_64.xml @@ -20,31 +20,6 @@ system.utils - /bin/lowntfs-3g - /bin/ntfs-3g - /bin/ntfs-3g.probe - /bin/ntfscat - /bin/ntfscluster - /bin/ntfscmp - /bin/ntfsdecrypt - /bin/ntfsfix - /bin/ntfsinfo - /bin/ntfsls - /bin/ntfsrecover - /bin/ntfssecaudit - /bin/ntfstruncate - /bin/ntfsusermap - /bin/ntfswipe - /sbin/mkfs.ntfs - /sbin/mkntfs - /sbin/mount.lowntfs-3g - /sbin/mount.ntfs - /sbin/mount.ntfs-3g - /sbin/ntfsclone - /sbin/ntfscp - /sbin/ntfslabel - /sbin/ntfsresize - /sbin/ntfsundelete /usr/bin/lowntfs-3g /usr/bin/ntfs-3g /usr/bin/ntfs-3g.probe @@ -107,7 +82,7 @@ programming.devel - ntfs-3g + ntfs-3g /usr/include/ntfs-3g/acls.h @@ -154,8 +129,8 @@ - - 2024-04-26 + + 2024-05-05 2022.10.3 Packaging update Reilly Brogan From 3e721d236ba0ea576897d35ad416f09cda6b8bad Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:42:30 -0500 Subject: [PATCH 22/30] ocamlbuild: Finish bin merge Signed-off-by: Reilly Brogan --- packages/o/ocamlbuild/package.yml | 9 +-------- packages/o/ocamlbuild/pspec_x86_64.xml | 7 ++----- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/o/ocamlbuild/package.yml b/packages/o/ocamlbuild/package.yml index 659fb0e31b7..34813188da3 100644 --- a/packages/o/ocamlbuild/package.yml +++ b/packages/o/ocamlbuild/package.yml @@ -1,6 +1,6 @@ name : ocamlbuild version : 0.14.2 -release : 8 +release : 9 source : - https://github.com/ocaml/ocamlbuild/archive/refs/tags/0.14.2.tar.gz : 62d2dab6037794c702a83ac584a7066d018cf1645370d1f3d5764c2b458791b1 license : LGPL-2.1 @@ -20,10 +20,3 @@ build : | install : | %make_install - # usr-merge - install -D -d -m 00755 $installdir/bin - pushd $installdir/usr/bin - for FILE in *; do - ln -srv $installdir/usr/bin/$FILE $installdir/bin/$FILE - done - popd diff --git a/packages/o/ocamlbuild/pspec_x86_64.xml b/packages/o/ocamlbuild/pspec_x86_64.xml index 4d5bc22dbe1..1c9eda33180 100644 --- a/packages/o/ocamlbuild/pspec_x86_64.xml +++ b/packages/o/ocamlbuild/pspec_x86_64.xml @@ -20,9 +20,6 @@ programming.tools - /bin/ocamlbuild - /bin/ocamlbuild.byte - /bin/ocamlbuild.native /usr/bin/ocamlbuild /usr/bin/ocamlbuild.byte /usr/bin/ocamlbuild.native @@ -51,8 +48,8 @@ - - 2024-04-26 + + 2024-05-05 0.14.2 Packaging update Reilly Brogan From 09c126a6f6dbee5414fe5bf2886fd0c141d44c28 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:43:41 -0500 Subject: [PATCH 23/30] sed: Finish bin merge Signed-off-by: Reilly Brogan --- packages/s/sed/package.yml | 4 +--- packages/s/sed/pspec_x86_64.xml | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/s/sed/package.yml b/packages/s/sed/package.yml index 001f13d237f..23bdc87488d 100644 --- a/packages/s/sed/package.yml +++ b/packages/s/sed/package.yml @@ -1,6 +1,6 @@ name : sed version : '4.9' -release : 12 +release : 13 source : - https://ftp.gnu.org/gnu/sed/sed-4.9.tar.xz : 6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181 homepage : https://www.gnu.org/software/sed/ @@ -17,7 +17,5 @@ build : | %make install : | %make_install - install -dm00755 $installdir/bin - ln -srv $installdir/usr/bin/sed $installdir/bin/sed check : | %make check diff --git a/packages/s/sed/pspec_x86_64.xml b/packages/s/sed/pspec_x86_64.xml index 4c0f406938d..5a32d0a0638 100644 --- a/packages/s/sed/pspec_x86_64.xml +++ b/packages/s/sed/pspec_x86_64.xml @@ -20,7 +20,6 @@ system.base - /bin/sed /usr/bin/sed /usr/share/info/sed.info /usr/share/locale/af/LC_MESSAGES/sed.mo @@ -67,8 +66,8 @@ - - 2024-04-23 + + 2024-05-05 4.9 Packaging update Reilly Brogan From ff37b7f62b2c998398e075be128c8db61aea81fc Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:44:44 -0500 Subject: [PATCH 24/30] shadow: Finish bin merge Signed-off-by: Reilly Brogan --- packages/s/shadow/package.yml | 12 +----------- packages/s/shadow/pspec_x86_64.xml | 30 +++--------------------------- 2 files changed, 4 insertions(+), 38 deletions(-) diff --git a/packages/s/shadow/package.yml b/packages/s/shadow/package.yml index 615acf7914e..025830bb0da 100644 --- a/packages/s/shadow/package.yml +++ b/packages/s/shadow/package.yml @@ -1,6 +1,6 @@ name : shadow version : 4.14.7 -release : 29 +release : 30 source : - https://github.com/shadow-maint/shadow/releases/download/4.14.7/shadow-4.14.7.tar.xz : 3f380f74468b2087d882851573593172046672d93f462edbc0ca1d78dfee54da license : BSD-3-Clause @@ -92,16 +92,6 @@ install : | rm -v $installdir/etc/login.defs rmdir $installdir/etc - # Install compat links T10615 - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done - # Cleanup find $installdir -type d -empty -print -delete diff --git a/packages/s/shadow/pspec_x86_64.xml b/packages/s/shadow/pspec_x86_64.xml index 9e8a5b8263d..288292b6121 100644 --- a/packages/s/shadow/pspec_x86_64.xml +++ b/packages/s/shadow/pspec_x86_64.xml @@ -20,30 +20,6 @@ system.base - /bin/chage - /bin/expiry - /bin/getsubids - /bin/gpasswd - /bin/newgidmap - /bin/newuidmap - /bin/passwd - /bin/sg - /sbin/chgpasswd - /sbin/chpasswd - /sbin/groupadd - /sbin/groupdel - /sbin/groupmems - /sbin/groupmod - /sbin/grpck - /sbin/grpconv - /sbin/grpunconv - /sbin/newusers - /sbin/pwck - /sbin/pwconv - /sbin/pwunconv - /sbin/useradd - /sbin/userdel - /sbin/usermod /usr/bin/chage /usr/bin/expiry /usr/bin/getsubids @@ -421,7 +397,7 @@ programming.devel - shadow + shadow /usr/include/shadow/subid.h @@ -432,8 +408,8 @@ - - 2024-04-23 + + 2024-05-05 4.14.7 Packaging update Reilly Brogan From 1b81761841aaf50428c7a6ecbcc0e7597a73d3f4 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:52:12 -0500 Subject: [PATCH 25/30] systemd: Finish bin merge Signed-off-by: Reilly Brogan --- packages/s/systemd/package.yml | 18 ++---------------- packages/s/systemd/pspec_x86_64.xml | 20 ++++++-------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/packages/s/systemd/package.yml b/packages/s/systemd/package.yml index 15ee5d76dd7..22425de415f 100644 --- a/packages/s/systemd/package.yml +++ b/packages/s/systemd/package.yml @@ -1,6 +1,6 @@ name : systemd version : '254.11' -release : 151 +release : 152 source : - https://github.com/systemd/systemd-stable/archive/refs/tags/v254.11.tar.gz : be68d9297fc92b5bbdd48d46af373b80cd516091f7d7ccf528dbcbe1203e4cb2 license : @@ -177,34 +177,20 @@ install : | ln -sv ../remote-fs.target $installdir/usr/lib/systemd/system/multi-user.target.wants/remote-fs.target # Install compat dirs - install -D -d -m 00755 $installdir/{sbin,bin,lib/udev} + install -dm00755 $installdir/lib/udev # Compat for old tools - ln -srv $installdir/usr/bin/udevadm $installdir/sbin/udevadm ln -srv $installdir/usr/lib/systemd/systemd-udevd $installdir/lib/udev/udevd - # Make sure systemd + init can be found - ln -srv $installdir/usr/lib/systemd/systemd $installdir/bin/systemd - ln -srv $installdir/usr/lib/systemd/systemd $installdir/sbin/init - - # Ensure sbin links exist too - for control in reboot shutdown poweroff halt ; do - ln -srv $installdir/usr/bin/systemctl $installdir/sbin/$control - done - # We want systemd-update-helper, but not the RPM macros rm -rv $installdir/usr/lib/rpm - # Stateless xinitrc.d path install -Dm00755 xorg/50-systemd-user.sh -t $installdir/usr/share/defaults/etc/X11/xinit/xinitrc.d/ # Required basic support install -m 00644 $pkgfiles/solus-base-groups.sysusers $installdir/usr/lib/sysusers.d/solus-base-groups.conf - # Make assuming scripts happy - ln -srv $installdir/usr/bin/systemctl $installdir/bin/. - # add fixed pam config rm -rfv $installdir/usr/lib/pam.d install -Dm00644 $pkgfiles/systemd-user.pam $installdir/usr/share/defaults/etc/pam.d/systemd-user diff --git a/packages/s/systemd/pspec_x86_64.xml b/packages/s/systemd/pspec_x86_64.xml index 2204e265816..da1c736ef7c 100644 --- a/packages/s/systemd/pspec_x86_64.xml +++ b/packages/s/systemd/pspec_x86_64.xml @@ -21,15 +21,7 @@ system.base - /bin/systemctl - /bin/systemd /lib/udev/udevd - /sbin/halt - /sbin/init - /sbin/poweroff - /sbin/reboot - /sbin/shutdown - /sbin/udevadm /usr/bin/bootctl /usr/bin/busctl /usr/bin/coredumpctl @@ -1093,7 +1085,7 @@ emul32 - systemd + systemd /usr/lib32/libnss_myhostname.so.2 @@ -1117,8 +1109,8 @@ programming.devel - systemd-32bit - systemd-devel + systemd-devel + systemd-32bit /usr/lib32/pkgconfig/libsystemd.pc @@ -1132,7 +1124,7 @@ system.devel - systemd + systemd /usr/include/libudev.h @@ -1934,8 +1926,8 @@ - - 2024-04-26 + + 2024-05-05 254.11 Packaging update Reilly Brogan From fe67ae6b40497ed893d42ca73cba1e7be86f3bdf Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:55:43 -0500 Subject: [PATCH 26/30] tar: Finish bin merge Signed-off-by: Reilly Brogan --- packages/t/tar/package.yml | 6 +----- packages/t/tar/pspec_x86_64.xml | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/t/tar/package.yml b/packages/t/tar/package.yml index 8653bceb04a..063a2fb02c8 100644 --- a/packages/t/tar/package.yml +++ b/packages/t/tar/package.yml @@ -1,6 +1,6 @@ name : tar version : '1.35' -release : 16 +release : 17 source : - https://ftp.gnu.org/gnu/tar/tar-1.35.tar.xz : 4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16 homepage : https://www.gnu.org/software/tar/ @@ -19,10 +19,6 @@ build : | %make install : | %make_install - - # Usr-Merge - install -D -d -m 00755 $installdir/bin - ln -srv $installdir/usr/bin/tar $installdir/bin/tar check : | unset LD_PRELOAD %make check diff --git a/packages/t/tar/pspec_x86_64.xml b/packages/t/tar/pspec_x86_64.xml index a24b469760d..9bb2187b25a 100644 --- a/packages/t/tar/pspec_x86_64.xml +++ b/packages/t/tar/pspec_x86_64.xml @@ -20,7 +20,6 @@ system.base - /bin/tar /usr/bin/tar /usr/sbin/rmt /usr/share/info/tar.info @@ -71,8 +70,8 @@ - - 2024-04-23 + + 2024-05-05 1.35 Packaging update Reilly Brogan From 8950d1285d6fd8906a002a79b7b7899b7a5ab55e Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:56:37 -0500 Subject: [PATCH 27/30] tcsh: Finish bin merge Signed-off-by: Reilly Brogan --- packages/t/tcsh/package.yml | 12 ++---------- packages/t/tcsh/pspec_x86_64.xml | 5 ++--- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/t/tcsh/package.yml b/packages/t/tcsh/package.yml index 5c95d11b542..22a3c79f365 100644 --- a/packages/t/tcsh/package.yml +++ b/packages/t/tcsh/package.yml @@ -1,6 +1,6 @@ name : tcsh -version : '6.24.12' -release : 8 +version : 6.24.12 +release : 9 source : - https://astron.com/pub/tcsh/tcsh-6.24.12.tar.gz : e3270ce9667fd5bd2a046687659fcf5fd6a6781326f806ebd724f1e1c9cd4185 license : BSD-3-clause @@ -17,11 +17,3 @@ build : | %make install : | %make_install - - # usr-merge - install -D -d -m 00755 $installdir/bin - pushd $installdir/usr/bin - for FILE in *; do - ln -srv $installdir/usr/bin/$FILE $installdir/bin/$FILE - done - popd diff --git a/packages/t/tcsh/pspec_x86_64.xml b/packages/t/tcsh/pspec_x86_64.xml index 1b7a3e3ae61..c189b7c9ece 100644 --- a/packages/t/tcsh/pspec_x86_64.xml +++ b/packages/t/tcsh/pspec_x86_64.xml @@ -20,7 +20,6 @@ system.utils - /bin/tcsh /usr/bin/tcsh /usr/share/locale/C/LC_MESSAGES/tcsh.cat /usr/share/locale/de/LC_MESSAGES/tcsh.cat @@ -38,8 +37,8 @@ - - 2024-04-26 + + 2024-05-05 6.24.12 Packaging update Reilly Brogan From 493f174bee09f4ed423226d2a7503a9debb03199 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:58:01 -0500 Subject: [PATCH 28/30] util-linux: Finish bin merge Signed-off-by: Reilly Brogan --- packages/u/util-linux/package.yml | 12 +- packages/u/util-linux/pspec_x86_64.xml | 146 +------------------------ 2 files changed, 7 insertions(+), 151 deletions(-) diff --git a/packages/u/util-linux/package.yml b/packages/u/util-linux/package.yml index 3439e7a9c6d..fec391aaf60 100644 --- a/packages/u/util-linux/package.yml +++ b/packages/u/util-linux/package.yml @@ -1,6 +1,6 @@ name : util-linux version : '2.40' -release : 47 +release : 48 source : - https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.40/util-linux-2.40.tar.xz : d57a626081f9ead02fa44c63a6af162ec19c58f53e993f206ab7c3a6641c2cd7 # tarballs don't have pam_lastlog2/meson.build for some reason @@ -118,16 +118,6 @@ install : | # PAM install -dm00755 $installdir/usr/share/defaults/etc/pam.d install -m00644 $pkgfiles/pam.d/* -t $installdir/usr/share/defaults/etc/pam.d - - # Install compat links T10615 - for TOP in {bin,sbin}; do - install -D -d -m 00755 $installdir/$TOP - pushd $installdir/usr/$TOP - for FILE in *; do - ln -srv $installdir/usr/$TOP/$FILE $installdir/$TOP/$FILE - done - popd - done fi # Tests compile but they are not run because of # "Ignore util-linux test suite [non-root UID expected]." diff --git a/packages/u/util-linux/pspec_x86_64.xml b/packages/u/util-linux/pspec_x86_64.xml index b9a9195b35f..e7bfb9261da 100644 --- a/packages/u/util-linux/pspec_x86_64.xml +++ b/packages/u/util-linux/pspec_x86_64.xml @@ -23,140 +23,6 @@ Util-linux is a suite of essential tools for any Linux system, such as chsh, kill, cfdisk, mkfs, mount, and more. system.base - /bin/arch - /bin/cal - /bin/chfn - /bin/chmem - /bin/choom - /bin/chrt - /bin/chsh - /bin/col - /bin/colcrt - /bin/colrm - /bin/column - /bin/dmesg - /bin/eject - /bin/enosys - /bin/exch - /bin/fadvise - /bin/fallocate - /bin/fincore - /bin/findmnt - /bin/flock - /bin/getopt - /bin/hardlink - /bin/hexdump - /bin/i386 - /bin/ionice - /bin/ipcmk - /bin/ipcrm - /bin/ipcs - /bin/irqtop - /bin/isosize - /bin/kill - /bin/last - /bin/lastb - /bin/lastlog2 - /bin/line - /bin/linux32 - /bin/linux64 - /bin/logger - /bin/login - /bin/look - /bin/lsblk - /bin/lsclocks - /bin/lscpu - /bin/lsfd - /bin/lsipc - /bin/lsirq - /bin/lslocks - /bin/lslogins - /bin/lsmem - /bin/lsns - /bin/mcookie - /bin/mesg - /bin/more - /bin/mount - /bin/mountpoint - /bin/namei - /bin/newgrp - /bin/nsenter - /bin/pg - /bin/pipesz - /bin/prlimit - /bin/rename - /bin/renice - /bin/rev - /bin/script - /bin/scriptlive - /bin/scriptreplay - /bin/setarch - /bin/setpgid - /bin/setpriv - /bin/setsid - /bin/setterm - /bin/su - /bin/taskset - /bin/uclampset - /bin/ul - /bin/umount - /bin/uname26 - /bin/unshare - /bin/utmpdump - /bin/uuidgen - /bin/uuidparse - /bin/vigr - /bin/vipw - /bin/waitpid - /bin/wall - /bin/wdctl - /bin/whereis - /bin/write - /bin/x86_64 - /sbin/addpart - /sbin/agetty - /sbin/blkdiscard - /sbin/blkid - /sbin/blkpr - /sbin/blkzone - /sbin/blockdev - /sbin/cfdisk - /sbin/chcpu - /sbin/ctrlaltdel - /sbin/delpart - /sbin/fdisk - /sbin/findfs - /sbin/fsck - /sbin/fsck.cramfs - /sbin/fsck.minix - /sbin/fsfreeze - /sbin/fstrim - /sbin/hwclock - /sbin/ldattach - /sbin/losetup - /sbin/mkfs - /sbin/mkfs.bfs - /sbin/mkfs.cramfs - /sbin/mkfs.minix - /sbin/mkswap - /sbin/nologin - /sbin/partx - /sbin/pivot_root - /sbin/readprofile - /sbin/resizepart - /sbin/rfkill - /sbin/rtcwake - /sbin/runuser - /sbin/sfdisk - /sbin/sulogin - /sbin/swaplabel - /sbin/swapoff - /sbin/swapon - /sbin/switch_root - /sbin/tunelp - /sbin/uuidd - /sbin/wipefs - /sbin/zramctl /usr/bin/arch /usr/bin/cal /usr/bin/chfn @@ -614,7 +480,7 @@ Util-linux is a suite of essential tools for any Linux system, such as chsh, kill, cfdisk, mkfs, mount, and more. emul32 - util-linux + util-linux /usr/lib32/libblkid.so.1 @@ -635,8 +501,8 @@ Util-linux is a suite of essential tools for any Linux system, such as chsh, kill, cfdisk, mkfs, mount, and more. programming.devel - util-linux-32bit - util-linux-devel + util-linux-devel + util-linux-32bit /usr/lib32/lib_fdisk.a @@ -675,7 +541,7 @@ Util-linux is a suite of essential tools for any Linux system, such as chsh, kill, cfdisk, mkfs, mount, and more. system.devel - util-linux + util-linux /usr/include/blkid/blkid.h @@ -724,8 +590,8 @@ - - 2024-04-23 + + 2024-05-05 2.40 Packaging update Reilly Brogan From e5ab112def3b52ea977088a396d3f9a41dd9beb4 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 13:58:59 -0500 Subject: [PATCH 29/30] wpa_supplicant: Finish bin merge Signed-off-by: Reilly Brogan --- packages/w/wpa_supplicant/package.yml | 10 +--------- packages/w/wpa_supplicant/pspec_x86_64.xml | 8 ++------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/w/wpa_supplicant/package.yml b/packages/w/wpa_supplicant/package.yml index b60f7591747..c1f98fe22c8 100644 --- a/packages/w/wpa_supplicant/package.yml +++ b/packages/w/wpa_supplicant/package.yml @@ -1,6 +1,6 @@ name : wpa_supplicant version : '2.10' -release : 32 +release : 33 source : - https://w1.fi/releases/wpa_supplicant-2.10.tar.gz : 20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f homepage : https://w1.fi/wpa_supplicant/ @@ -36,11 +36,3 @@ install : | install -Dm00644 doc/docbook/*.5 -t $installdir/usr/share/man/man5 install -Dm00644 doc/docbook/*.8 -t $installdir/usr/share/man/man8 rm -v $installdir/usr/share/man/man8/wpa_{priv,gui}.8 - - # Install compat links T10615 (usr-merge) - install -D -d -m 00755 $installdir/sbin - pushd $installdir/usr/sbin - for FILE in *; do - ln -srv $installdir/usr/sbin/$FILE $installdir/sbin/$FILE - done - popd diff --git a/packages/w/wpa_supplicant/pspec_x86_64.xml b/packages/w/wpa_supplicant/pspec_x86_64.xml index e32aef1188f..5d932d3c8c3 100644 --- a/packages/w/wpa_supplicant/pspec_x86_64.xml +++ b/packages/w/wpa_supplicant/pspec_x86_64.xml @@ -20,10 +20,6 @@ network.base - /sbin/eapol_test - /sbin/wpa_cli - /sbin/wpa_passphrase - /sbin/wpa_supplicant /usr/lib/systemd/system/wpa_supplicant.service /usr/sbin/eapol_test /usr/sbin/wpa_cli @@ -40,8 +36,8 @@ - - 2024-04-23 + + 2024-05-05 2.10 Packaging update Reilly Brogan From 0c4d8decdd08bb9d2caf8dd82f3d4bc9ff053269 Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Sun, 5 May 2024 14:03:24 -0500 Subject: [PATCH 30/30] zsh: Finish bin merge Signed-off-by: Reilly Brogan --- packages/z/zsh/package.yml | 10 +--------- packages/z/zsh/pspec_x86_64.xml | 6 ++---- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/packages/z/zsh/package.yml b/packages/z/zsh/package.yml index 530738fde4b..4c12f896ccf 100644 --- a/packages/z/zsh/package.yml +++ b/packages/z/zsh/package.yml @@ -1,6 +1,6 @@ name : zsh version : '5.9' -release : 30 +release : 31 source : - https://ixpeering.dl.sourceforge.net/project/zsh/zsh/5.9/zsh-5.9.tar.xz : 9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5 homepage : https://www.zsh.org/ @@ -38,14 +38,6 @@ install : | rmdir $installdir/usr/share/zsh/site-functions install -dm00644 $installdir/usr/share/defaults/etc/zsh/ cp $pkgfiles/z* $installdir/usr/share/defaults/etc/zsh/ - - # Install compat links T10615 - install -D -d -m 00755 $installdir/bin - pushd $installdir/usr/bin - for FILE in *; do - ln -srv $installdir/usr/bin/$FILE $installdir/bin/$FILE - done - popd check : | unset LD_PRELOAD %make check diff --git a/packages/z/zsh/pspec_x86_64.xml b/packages/z/zsh/pspec_x86_64.xml index e1d12294b36..72068b40d5c 100644 --- a/packages/z/zsh/pspec_x86_64.xml +++ b/packages/z/zsh/pspec_x86_64.xml @@ -20,8 +20,6 @@ system.utils - /bin/zsh - /bin/zsh-5.9 /usr/bin/zsh /usr/bin/zsh-5.9 /usr/lib64/zsh/5.9/zsh/attr.so @@ -1397,8 +1395,8 @@ - - 2024-04-26 + + 2024-05-05 5.9 Packaging update Reilly Brogan