development/cosmocc: New maintainer, fix script perms.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 22 insertions, 37 deletions

diff --git a/development/cosmocc/cosmocc.SlackBuild b/development/cosmocc/cosmocc.SlackBuild
index 44b9a53c0f..bfb1b259ca 100644
--- a/development/cosmocc/cosmocc.SlackBuild
+++ b/development/cosmocc/cosmocc.SlackBuild
@@ -2,31 +2,22 @@
 
 # Slackware build script for cosmocc
 
-# Copyright 2024 Juan M. Lasca <juanmlasca@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written 2024 Juan M. Lasca <email removed>
+# Modified and now maintained by B. Watson <urchlay@slackware.uk>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240219 bkw: BUILD=3
+# - Take over maintenance.
+# - Relicense as WTFPL.
+# - Fix permission error in package, when $CWD files are not owned by root.
+# - Do not install upstream's licenses .xz compressed.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cosmocc
 VERSION=${VERSION:-3.2.4}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}		
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -57,18 +48,14 @@ mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 unzip $CWD/$PRGNAM-$VERSION.zip
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
-mkdir -p $PKG/opt/$PRGNAM $PKG/usr/bin;
-cp -a $CWD/scripts/ $PKG/opt/$PRGNAM; # see NOTES on README
+mkdir -p $PKG/opt/$PRGNAM/scripts $PKG/usr/bin
+install -m0755 -oroot -groot $CWD/scripts/* $PKG/opt/$PRGNAM/scripts
 
 for i in bin include x86_64-linux-cosmo aarch64-linux-cosmo libexec; do
-    mv $i $PKG/opt/$PRGNAM;
+  mv $i $PKG/opt/$PRGNAM
 done
 
 $(cd $PKG/usr/bin/;
@@ -81,12 +68,10 @@ $(cd $PKG/usr/bin/;
 # remove empty directories:
 rmdir $PKG/opt/cosmocc/libexec/gcc/{x86_64,aarch64}-linux-cosmo/11.2.0/install-tools
 
-xz -9 LICENSE.*gpl[23];
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  LICENSE.*gpl[23].xz README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a LICENSE.*gpl* README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/cosmocc/cosmocc.info b/development/cosmocc/cosmocc.info
index 2a560bdac4..0f56d7f645 100644
--- a/development/cosmocc/cosmocc.info
+++ b/development/cosmocc/cosmocc.info
@@ -6,5 +6,5 @@ MD5SUM=""
 DOWNLOAD_x86_64="https://cosmo.zip/pub/cosmocc/cosmocc-3.2.4.zip"
 MD5SUM_x86_64="77388a5964416aaa65ac60e400e3569a"
 REQUIRES=""
-MAINTAINER="Juan M. Lasca"
-EMAIL="juanmlasca@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"