Finish bin merge (#2480)

**Summary** - Removes all `/bin` and `/sbin` symlinks in packages Part of #293
getsolus · May 7, 2024 · e0b6000 · e0b6000
2 parents db86011 + 0c4d8de
commit e0b6000
Show file tree

Hide file tree

Showing 60 changed files with 144 additions and 780 deletions.
diff --git 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
@@ -20,9 +20,6 @@
 </Description>
         <PartOf>system.base</PartOf>
         <Files>
-            <Path fileType="executable">/bin/chacl</Path>
-            <Path fileType="executable">/bin/getfacl</Path>
-            <Path fileType="executable">/bin/setfacl</Path>
             <Path fileType="executable">/usr/bin/chacl</Path>
             <Path fileType="executable">/usr/bin/getfacl</Path>
             <Path fileType="executable">/usr/bin/setfacl</Path>
@@ -55,7 +52,7 @@
 </Description>
         <PartOf>emul32</PartOf>
         <RuntimeDependencies>
-            <Dependency release="18">acl</Dependency>
+            <Dependency release="19">acl</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libacl.so.1</Path>
@@ -69,8 +66,8 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="18">acl-devel</Dependency>
-            <Dependency release="18">acl-32bit</Dependency>
+            <Dependency release="19">acl-devel</Dependency>
+            <Dependency release="19">acl-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libacl.a</Path>
@@ -85,7 +82,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="18">acl</Dependency>
+            <Dependency release="19">acl</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/acl/libacl.h</Path>
@@ -135,8 +132,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="18">
-            <Date>2024-04-23</Date>
+        <Update release="19">
+            <Date>2024-05-05</Date>
             <Version>2.3.2</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>

diff --git 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
@@ -222,7 +222,6 @@
             <Path fileType="config">/etc/apparmor/parser.conf</Path>
             <Path fileType="config">/etc/apparmor/severity.db</Path>
             <Path fileType="data">/lib/apparmor</Path>
-            <Path fileType="executable">/sbin/apparmor_parser</Path>
             <Path fileType="executable">/usr/bin/aa-easyprof</Path>
             <Path fileType="executable">/usr/bin/aa-enabled</Path>
             <Path fileType="executable">/usr/bin/aa-exec</Path>
@@ -584,7 +583,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="27">apparmor</Dependency>
+            <Dependency release="28">apparmor</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/aalogparse/aalogparse.h</Path>
@@ -600,8 +599,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="27">
-            <Date>2024-04-23</Date>
+        <Update release="28">
+            <Date>2024-05-05</Date>
             <Version>3.1.7</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>

diff --git 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
@@ -21,9 +21,6 @@
 </Description>
         <PartOf>system.base</PartOf>
         <Files>
-            <Path fileType="executable">/bin/attr</Path>
-            <Path fileType="executable">/bin/getfattr</Path>
-            <Path fileType="executable">/bin/setfattr</Path>
             <Path fileType="executable">/usr/bin/attr</Path>
             <Path fileType="executable">/usr/bin/getfattr</Path>
             <Path fileType="executable">/usr/bin/setfattr</Path>
@@ -53,7 +50,7 @@
 </Description>
         <PartOf>emul32</PartOf>
         <RuntimeDependencies>
-            <Dependency release="19">attr</Dependency>
+            <Dependency release="20">attr</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libattr.so.1</Path>
@@ -67,8 +64,8 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="19">attr-32bit</Dependency>
-            <Dependency release="19">attr-devel</Dependency>
+            <Dependency release="20">attr-devel</Dependency>
+            <Dependency release="20">attr-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32/libattr.a</Path>
@@ -83,7 +80,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="19">attr</Dependency>
+            <Dependency release="20">attr</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/attr/attributes.h</Path>
@@ -105,8 +102,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="19">
-            <Date>2024-04-26</Date>
+        <Update release="20">
+            <Date>2024-05-05</Date>
             <Version>2.5.2</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>

diff --git 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
@@ -21,18 +21,6 @@
 </Description>
         <PartOf>system.base</PartOf>
         <Files>
-            <Path fileType="executable">/bin/aulast</Path>
-            <Path fileType="executable">/bin/aulastlog</Path>
-            <Path fileType="executable">/bin/ausyscall</Path>
-            <Path fileType="executable">/sbin/audisp-af_unix</Path>
-            <Path fileType="executable">/sbin/audisp-filter</Path>
-            <Path fileType="executable">/sbin/audisp-remote</Path>
-            <Path fileType="executable">/sbin/audisp-syslog</Path>
-            <Path fileType="executable">/sbin/auditctl</Path>
-            <Path fileType="executable">/sbin/auditd</Path>
-            <Path fileType="executable">/sbin/augenrules</Path>
-            <Path fileType="executable">/sbin/aureport</Path>
-            <Path fileType="executable">/sbin/ausearch</Path>
             <Path fileType="executable">/usr/bin/aulast</Path>
             <Path fileType="executable">/usr/bin/aulastlog</Path>
             <Path fileType="executable">/usr/bin/ausyscall</Path>
@@ -123,7 +111,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="16">audit</Dependency>
+            <Dependency release="17">audit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/audit-records.h</Path>
@@ -233,8 +221,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="16">
-            <Date>2024-04-26</Date>
+        <Update release="17">
+            <Date>2024-05-05</Date>
             <Version>4.0.1</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>

diff --git 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
@@ -3,8 +3,8 @@
         <Name>bash</Name>
         <Homepage>https://www.gnu.org/software/bash</Homepage>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>system.base</PartOf>
@@ -20,8 +20,6 @@
 </Description>
         <PartOf>system.base</PartOf>
         <Files>
-            <Path fileType="executable">/bin/bash</Path>
-            <Path fileType="executable">/bin/sh</Path>
             <Path fileType="executable">/usr/bin/bash</Path>
             <Path fileType="executable">/usr/bin/bashbug</Path>
             <Path fileType="executable">/usr/bin/sh</Path>
@@ -133,7 +131,7 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="72">bash</Dependency>
+            <Dependency release="73">bash</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/bash/alias.h</Path>
@@ -199,12 +197,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="72">
-            <Date>2024-04-29</Date>
+        <Update release="73">
+            <Date>2024-05-05</Date>
             <Version>5.2.26</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Update>
     </History>
 </PISI>
diff --git 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