From 0e9263b116e72e9c4f6270e74216cb60262d59b6 Mon Sep 17 00:00:00 2001 From: Heinz Wiesinger Date: Sat, 20 Nov 2021 14:24:31 +0100 Subject: system/commons-daemon: Updated for version 1.2.4 Don't build jar files from source anymore. They switched from ant to maven, which now requires a ton of dependencies that seemingly need to be downloaded into $HOME and I haven't found a workaround for that yet. Signed-off-by: Heinz Wiesinger Signed-off-by: Willy Sudiarto Raharjo --- system/commons-daemon/commons-daemon.SlackBuild | 65 +++++++++++++++---------- system/commons-daemon/commons-daemon.info | 10 ++-- 2 files changed, 45 insertions(+), 30 deletions(-) (limited to 'system') diff --git a/system/commons-daemon/commons-daemon.SlackBuild b/system/commons-daemon/commons-daemon.SlackBuild index 71cb955a00ba..c0cdea698239 100644 --- a/system/commons-daemon/commons-daemon.SlackBuild +++ b/system/commons-daemon/commons-daemon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for commons-daemon -# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -11,21 +11,21 @@ # 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. +# 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. cd $(dirname $0) ; CWD=$(pwd) PRGNAM=commons-daemon -VERSION=${VERSION:-1.0.15} +VERSION=${VERSION:-1.2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -69,9 +69,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION-src -tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz -cd $PRGNAM-$VERSION-src +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION-bin.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -79,15 +79,26 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -ant dist +mkdir -p $PKG/usr/share/java -mkdir -p $PKG/usr/{share/java,bin} - -cp dist/$PRGNAM-$VERSION.jar $PKG/usr/share/java/ +cp $PRGNAM-$VERSION.jar $PKG/usr/share/java/ cd $PKG/usr/share/java ln -s $PRGNAM-$VERSION.jar $PRGNAM.jar cd - +cd $TMP +rm -rf $PRGNAM-$VERSION-src +tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz +cd $PRGNAM-$VERSION-src +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 {} \; + +mkdir -p $PKG/usr/bin + cd src/native/unix/ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -98,20 +109,22 @@ cd src/native/unix/ --localstatedir=/var \ --mandir=/usr/man \ --build=$ARCH-slackware-linux + make clean make + install -m 0755 jsvc $PKG/usr/bin/jsvc -cd - +cd ../../../ + +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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/jsvc -cd dist - cp -a docs/api LICENSE.txt NOTICE.txt RELEASE-NOTES.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION -cd - +cp -a src/docs LICENSE.txt NOTICE.txt RELEASE-NOTES.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION cd src/native/unix/ - cp -a CHANGES.txt INSTALL.txt $PKG/usr/doc/$PRGNAM-$VERSION/jsvc + cp -a INSTALL.txt $PKG/usr/doc/$PRGNAM-$VERSION/jsvc cd - -cp -a src/docs $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/commons-daemon/commons-daemon.info b/system/commons-daemon/commons-daemon.info index 0f6229144e0d..0f2493112aa5 100644 --- a/system/commons-daemon/commons-daemon.info +++ b/system/commons-daemon/commons-daemon.info @@ -1,10 +1,12 @@ PRGNAM="commons-daemon" -VERSION="1.0.15" +VERSION="1.2.4" HOMEPAGE="http://commons.apache.org/daemon/index.html" -DOWNLOAD="http://archive.apache.org/dist/commons/daemon/source/commons-daemon-1.0.15-src.tar.gz" -MD5SUM="e467bc1f332d47ad85d18ea8b8a897c3" +DOWNLOAD="https://dlcdn.apache.org//commons/daemon/binaries/commons-daemon-1.2.4-bin.tar.gz \ + https://dlcdn.apache.org//commons/daemon/source/commons-daemon-1.2.4-src.tar.gz" +MD5SUM="01a2e531c9ecbc545492308c911aa570 \ + 928f6243a50f01f6b9dafcac585889ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="apache-ant jdk" +REQUIRES="jdk" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" -- cgit v1.2.3