wok-next rev 20767
mediawiki: up (1.30.0); mt-daapd, nagios: tiny edits
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Wed Jun 06 12:12:40 2018 +0300 (2018-06-06) |
| parents | 86b5d202495a |
| children | 2b1b5432c9c8 |
| files | mediawiki/receipt mt-daapd/receipt nagios/receipt nagios/stuff/nagios.desktop |
line diff
1.1 --- a/mediawiki/receipt Wed Jun 06 04:36:32 2018 +0300 1.2 +++ b/mediawiki/receipt Wed Jun 06 12:12:40 2018 +0300 1.3 @@ -1,35 +1,42 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="mediawiki" 1.8 -VERSION="1.19.0" 1.9 +VERSION="1.30.0" 1.10 CATEGORY="network" 1.11 SHORT_DESC="MediaWiki engine" 1.12 MAINTAINER="slaxemulator@gmail.com" 1.13 LICENSE="GPL2" 1.14 -WEB_SITE="http://www.mediawiki.org/wiki/MediaWiki" 1.15 +WEB_SITE="https://www.mediawiki.org/wiki/MediaWiki" 1.16 + 1.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.18 -WGET_URL="http://download.wikimedia.org/mediawiki/${VERSION:0:4}/$TARBALL" 1.19 +WGET_URL="https://releases.wikimedia.org/mediawiki/${VERSION%.*}/$TARBALL" 1.20 1.21 -DEPENDS="php" 1.22 +compile_rules() { 1.23 + mkdir -p \ 1.24 + $install/usr/share/webapps \ 1.25 + $install/etc/webapps/mediawiki 1.26 1.27 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.28 -genpkg_rules() 1.29 -{ 1.30 - mkdir -p $fs/usr/share/webapps $fs/etc/webapps/mediawiki 1.31 - cp -a $src $fs/usr/share/webapps/mediawiki 1.32 - sed -i -e 's#is_executable#is_file#' -e 's#is_executable#is_file#'$fs/includes/Math.php 1.33 - echo "deny from all" >> $fs/etc/webapps/mediawiki/.htaccess 1.34 - ln -sf /etc/webapps/mediawiki/.htaccess $fs/usr/share/webapps/mediawiki/.htaccess 1.35 + cp -a $src $install/usr/share/webapps/mediawiki 1.36 + rm -r $install/usr/share/webapps/mediawiki/tests 1.37 + 1.38 + echo "Deny from all" >> $install/usr/share/webapps/mediawiki/.htaccess 1.39 + echo "Deny from all" >> $install/etc/webapps/mediawiki/.htaccess 1.40 + 1.41 # move cache and images to /var 1.42 - install -vdm0755 -o www -g www $fs/var/cache/mediawiki 1.43 - install -vdm0755 -o www -g www $fs/var/lib/mediawiki 1.44 - cd $fs/usr/share/webapps/mediawiki 1.45 - mv cache/.htaccess $fs/var/cache/mediawiki 1.46 - rmdir cache 1.47 - ln -sf /var/cache/mediawiki cache 1.48 - 1.49 - mv images/* $fs/var/lib/mediawiki 1.50 - mv images/.htaccess $fs/var/lib/mediawiki 1.51 - rmdir images 1.52 - ln -sf /var/lib/mediawiki images 1.53 + mkdir -p $install/var/cache/ 1.54 + mv $install/usr/share/webapps/mediawiki/cache $install/var/cache/mediawiki 1.55 + ln -s /var/cache/mediawiki $install/usr/share/webapps/mediawiki/cache 1.56 + 1.57 + mkdir -p $install/var/lib/ 1.58 + mv $install/usr/share/webapps/mediawiki/images $install/var/lib/mediawiki 1.59 + ln -s /var/lib/mediawiki $install/usr/share/webapps/mediawiki/images 1.60 + 1.61 + chown -R www:www $install/var/cache/mediawiki $install/var/lib/mediawiki 1.62 + 1.63 + fix symlinks 1.64 } 1.65 + 1.66 +genpkg_rules() { 1.67 + copy @std 1.68 + DEPENDS="php" 1.69 +}
2.1 --- a/mt-daapd/receipt Wed Jun 06 04:36:32 2018 +0300 2.2 +++ b/mt-daapd/receipt Wed Jun 06 12:12:40 2018 +0300 2.3 @@ -1,30 +1,28 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="mt-daapd" 2.8 VERSION="0.2.4.2" 2.9 CATEGORY="multimedia" 2.10 -SHORT_DESC="Media server for the Roku SoundBridge and iTunes." 2.11 +SHORT_DESC="Media server for the Roku SoundBridge and iTunes" 2.12 MAINTAINER="pascal.bellard@slitaz.org" 2.13 LICENSE="GPL2" 2.14 +WEB_SITE="https://www.fireflymediaserver.net/" 2.15 + 2.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.17 -WEB_SITE="http://fireflymediaserver.org/" 2.18 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 2.19 -PROVIDE="firefly" 2.20 2.21 -DEPENDS="gdbm libid3tag zlib" 2.22 -BUILD_DEPENDS="gdbm-dev libid3tag-dev glib zlib-dev" 2.23 +BUILD_DEPENDS="gdbm-dev libid3tag-dev zlib-dev" 2.24 2.25 -# Rules to configure and make the package. 2.26 -# 2.27 -compile_rules() 2.28 -{ 2.29 - ./configure --prefix=/usr $CONFIGURE_ARGS && 2.30 +compile_rules() { 2.31 + export CFLAGS="$CFLAGS -lpthread -lz -lgdbm -lid3tag" 2.32 + 2.33 + ./configure $CONFIGURE_ARGS && 2.34 make && 2.35 - make DESTDIR=$DESTDIR install 2.36 + make install 2.37 } 2.38 2.39 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.40 -genpkg_rules() 2.41 -{ 2.42 - cp -a $install/usr $fs 2.43 +genpkg_rules() { 2.44 + copy @std 2.45 + DEPENDS="gdbm libid3tag zlib" 2.46 + PROVIDE="firefly" 2.47 }
3.1 --- a/nagios/receipt Wed Jun 06 04:36:32 2018 +0300 3.2 +++ b/nagios/receipt Wed Jun 06 12:12:40 2018 +0300 3.3 @@ -11,12 +11,10 @@ 3.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.5 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 3.6 3.7 -BUILD_DEPENDS="libgd-dev libpng16-dev jpeg-dev libtool" 3.8 +BUILD_DEPENDS="libgd-dev libpng16-dev libjpeg-turbo-dev libtool" 3.9 SPLIT="nagios-dev" 3.10 3.11 compile_rules() { 3.12 - sed -i '/sysconfdir=/ s|^|#|' /etc/slitaz/cook.site # default sysconfdir=/etc 3.13 - 3.14 ./configure \ 3.15 --sysconfdir=/etc/nagios \ 3.16 --libexecdir=/usr/lib/nagios/plugins \ 3.17 @@ -38,42 +36,35 @@ 3.18 make install-config && 3.19 make install-commandmode && 3.20 make install-webconf && 3.21 - make install-classicui 3.22 + make install-classicui || return 1 3.23 + 3.24 + install -Dm755 $stuff/nagios $install/etc/init.d/nagios 3.25 + install -Dm644 $stuff/htpasswd.users $install/etc/nagios/htpasswd.users 3.26 + 3.27 + cp -r include/ $install/usr/ 3.28 + 3.29 + mkdir -p $install/var/log/nagios 3.30 + 3.31 + chown -R root:root $install 3.32 + chmod -R g-w $install 3.33 + chmod 755 $install/usr/bin/* # was 754 3.34 + chmod 644 $install/usr/include/locations.h # was 600 3.35 } 3.36 3.37 genpkg_rules() { 3.38 case $PACKAGE in 3.39 nagios) 3.40 - mkdir -p \ 3.41 - $fs/usr $fs/etc/init.d \ 3.42 - $fs/var/lib/nagios/rw \ 3.43 - $fs/var/log/nagios \ 3.44 - $fs/var/spool/nagios/checkresults \ 3.45 - $fs/etc/apache 3.46 + copy @std 3.47 + # Fix Apache config for Nagvis 3.48 + sed -i 's/Options None/Options FollowSymLinks/' \ 3.49 + $fs/etc/apache/conf.d/nagios.conf 3.50 3.51 - cp -a $install/etc/apache $fs/etc 3.52 - cp -a $install/etc/nagios $fs/etc 3.53 - cp -a $stuff/nagios $fs/etc/init.d 3.54 - install -m644 $stuff/htpasswd.users $fs/etc/nagios/ 3.55 - 3.56 - cp -a $install/usr/bin $fs/usr 3.57 - cp -a $install/usr/lib $fs/usr 3.58 - cp -a $install/usr/share $fs/usr 3.59 - 3.60 - # Put doc in separate package 3.61 - rm -rf $fs/usr/share/nagios/docs 3.62 - 3.63 - # Fix Apache config for Nagvis 3.64 - sed -i 's/Options None/Options FollowSymLinks/' $fs/etc/apache/conf.d/nagios.conf 3.65 - 3.66 - # Fix permissions 3.67 - chmod 755 $fs/usr/bin/nagios* 3.68 - DEPENDS="apache nagios-plugins libpng16 libjpeg libltdl" 3.69 + DEPENDS="libgd libltdl apache nagios-plugins libpng16 \ 3.70 + libjpeg-turbo" 3.71 SUGGESTED="nagios-nrpe" 3.72 ;; 3.73 nagios-dev) 3.74 - mkdir -p $fs/usr 3.75 - cp -pa $src/include $fs/usr 3.76 + copy @dev 3.77 ;; 3.78 esac 3.79 } 3.80 @@ -85,7 +76,8 @@ 3.81 fi 3.82 3.83 # Fix perms for files and directories 3.84 - chroot "$1/" chown -R nagios.nagios /var/log/nagios \ 3.85 + chroot "$1/" chown -R nagios.nagios \ 3.86 + /var/log/nagios \ 3.87 /var/spool/nagios \ 3.88 /var/lib/nagios \ 3.89 /usr/share/nagios \ 3.90 @@ -112,5 +104,5 @@ 3.91 } 3.92 3.93 pre_remove_nagios() { 3.94 - [ "$1" ] || /etc/init.d/nagios stop 3.95 + [ -n "$1" ] || /etc/init.d/nagios stop 3.96 }
4.1 --- a/nagios/stuff/nagios.desktop Wed Jun 06 04:36:32 2018 +0300 4.2 +++ b/nagios/stuff/nagios.desktop Wed Jun 06 12:12:40 2018 +0300 4.3 @@ -2,7 +2,7 @@ 4.4 Encoding=UTF-8 4.5 Name=Nagios 4.6 Comment=Network Monitoring 4.7 -Comment[fr]=Supervision Réseaux 4.8 +Comment[fr]=Supervision Réseaux 4.9 Icon=nagios 4.10 Exec=firefox http://localhost/nagios 4.11 Type=Application