1 files changed, 11 insertions, 14 deletions
diff --git a/system/opendoas/opendoas.SlackBuild b/system/opendoas/opendoas.SlackBuild
index fbe7c85302..6d50bf541c 100644
--- a/system/opendoas/opendoas.SlackBuild
+++ b/system/opendoas/opendoas.SlackBuild
@@ -22,6 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org, to use the correct github
+# download URL.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=opendoas
@@ -51,9 +54,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -83,14 +83,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 # Pass in shadow support if PAM is not installed. OpenDoas defaults to PAM
 # authentication otherwise.
@@ -103,25 +103,22 @@ fi
 SBBUILD=$BUILD
 unset BUILD
 
-# No CXXFLAGS
-CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   $SHADOW \
   $TIMESTAMP \
   --mandir=/usr/man
 
+# 20220210 bkw: actually use SLKCFLAGS.
+sed -i "s,-O2,$SLKCFLAGS," GNUmakefile
+
 make
 make install DESTDIR=$PKG
+strip $PKG/usr/bin/*
+gzip -9 $PKG/usr/man/man*/*
 
 BUILD=$SBBUILD
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   LICENSE README.md \