diff options
| -rw-r--r-- | system/goaccess/doinst.sh | 14 | ||||
| -rw-r--r-- | system/goaccess/goaccess.SlackBuild | 19 | ||||
| -rw-r--r-- | system/goaccess/goaccess.info | 6 |
3 files changed, 27 insertions, 12 deletions
diff --git a/system/goaccess/doinst.sh b/system/goaccess/doinst.sh new file mode 100644 index 0000000000..07fd2e932b --- /dev/null +++ b/system/goaccess/doinst.sh @@ -0,0 +1,14 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/goaccess.conf.new diff --git a/system/goaccess/goaccess.SlackBuild b/system/goaccess/goaccess.SlackBuild index 3b0bfbd962..c6d7b4c842 100644 --- a/system/goaccess/goaccess.SlackBuild +++ b/system/goaccess/goaccess.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=goaccess -VERSION=${VERSION:-0.7} +VERSION=${VERSION:-0.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -66,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.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 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -88,20 +88,21 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 +mv $PKG/etc/goaccess.conf $PKG/etc/goaccess.conf.new + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/goaccess/goaccess.info b/system/goaccess/goaccess.info index 78da14873d..0069ee5d13 100644 --- a/system/goaccess/goaccess.info +++ b/system/goaccess/goaccess.info @@ -1,8 +1,8 @@ PRGNAM="goaccess" -VERSION="0.7" +VERSION="0.9.4" HOMEPAGE="http://goaccess.prosoftcorp.com/download" -DOWNLOAD="https://downloads.sourceforge.net/goaccess/goaccess-0.7.tar.gz" -MD5SUM="6f7091dc320f8c695e9523279b521c38" +DOWNLOAD="http://tar.goaccess.io/goaccess-0.9.4.tar.gz" +MD5SUM="2671796a17d2488f65b657bc39e26de5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |