wok-next rev 20469
Up amsn, apache (2.4.28), apache-mod-perl (2.0.10), apcupsd (3.14.14)
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Thu Mar 08 14:02:42 2018 +0200 (2018-03-08) |
| parents | d463ecdfa17e |
| children | 6e0553fe45e7 |
| files | amsn/receipt apache-mod-perl/receipt apache/receipt apcupsd/receipt |
line diff
1.1 --- a/amsn/receipt Thu Mar 08 02:34:55 2018 +0200 1.2 +++ b/amsn/receipt Thu Mar 08 14:02:42 2018 +0200 1.3 @@ -14,8 +14,12 @@ 1.4 BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev libjpeg-turbo-dev xorg-libICE-dev \ 1.5 xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \ 1.6 xorg-libXScrnSaver-dev zlib-dev libpng16-dev libv4l-dev autoconf automake" 1.7 +# for audio conversations: gst0-plugins-base-dev; 1.8 +# also need absent farstream-0.1 and farsight2-0.10 >= 0.0.9 1.9 +COOKOPTS="!pngz" # some png are really gif, and many problems with palette 1.10 1.11 compile_rules() { 1.12 + fix ld 1.13 ./configure \ 1.14 --prefix=/usr \ 1.15 --with-tcl=/usr/lib \ 1.16 @@ -31,8 +35,7 @@ 1.17 1.18 genpkg_rules() { 1.19 copy @std 1.20 - DEPENDS="libjpeg-turbo libpng16 python xorg-libICE xorg-libSM xorg-libX11 \ 1.21 - zlib tk glib tls xorg-libXau xorg-libXdmcp xorg-libXScrnSaver libv4l" 1.22 + DEPENDS="libjpeg-turbo libpng16 python xorg-libX11 tk glib tls libv4l" 1.23 # /usr/share/amsn/plugins/amsnplus/snapshot depends on libImlib.so.11 - absent 1.24 TAGS="chat messenger im" 1.25 }
2.1 --- a/apache-mod-perl/receipt Thu Mar 08 02:34:55 2018 +0200 2.2 +++ b/apache-mod-perl/receipt Thu Mar 08 14:02:42 2018 +0200 2.3 @@ -1,39 +1,36 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="apache-mod-perl" 2.8 -VERSION="2.0.8" 2.9 +VERSION="2.0.10" 2.10 CATEGORY="network" 2.11 SHORT_DESC="PERL module for Apache" 2.12 MAINTAINER="erjo@slitaz.org" 2.13 LICENSE="Apache" 2.14 -SOURCE="mod_perl" 2.15 -TARBALL="$SOURCE-$VERSION.tar.gz" 2.16 WEB_SITE="http://perl.apache.org/" 2.17 -WGET_URL="http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/$TARBALL" 2.18 2.19 -DEPENDS="apache perl-thread" 2.20 -BUILD_DEPENDS="gdbm-dev apache-dev apr-dev apr-util-dev apache perl-thread" 2.21 +TARBALL="mod_perl-$VERSION.tar.gz" 2.22 +#WGET_URL="http://search.cpan.org/CPAN/authors/id/P/PH/PHRED/$TARBALL" 2.23 +WGET_URL="http://apache.ip-connect.vn.ua/perl/$TARBALL" 2.24 2.25 -# Rules to configure and make the package. 2.26 -compile_rules() 2.27 -{ 2.28 - cd $src 2.29 - perl Makefile.PL MP_APXS=/usr/bin/apxs \ 2.30 - MP_APR_CONFIG=/usr/bin/apr-1-config 2.31 - sed -i 's/remote_ip/client_ip/;s/remote_addr/client_addr/' \ 2.32 - WrapXS/Apache2/Connection/Connection.xs 2.33 - sed -i 's/>loglevel/>log.level/' \ 2.34 - WrapXS/Apache2/ServerRec/ServerRec.xs 2.35 +BUILD_DEPENDS="gdbm-dev apache-dev apr-dev apr-util-dev apache perl-dev" 2.36 +SPLIT="apache-mod-perl-dev" 2.37 + 2.38 +compile_rules() { 2.39 + perl Makefile.PL \ 2.40 + MP_APXS=/usr/bin/apxs \ 2.41 + MP_APR_CONFIG=/usr/bin/apr-1-config 2.42 make && 2.43 make DESTDIR=$DESTDIR install 2.44 } 2.45 2.46 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.47 -genpkg_rules() 2.48 -{ 2.49 - mkdir -p $fs/usr/share 2.50 - cp -a $install/usr/bin $fs/usr 2.51 - cp -a $install/usr/lib $fs/usr 2.52 - cp -a $install/usr/share/apache $fs/usr/share 2.53 - 2.54 +genpkg_rules() { 2.55 + case $PACKAGE in 2.56 + apache-mod-perl) 2.57 + copy @std 2.58 + DEPENDS="apache perl" 2.59 + ;; 2.60 + *-dev) 2.61 + copy @dev 2.62 + ;; 2.63 + esac 2.64 }
3.1 --- a/apache/receipt Thu Mar 08 02:34:55 2018 +0200 3.2 +++ b/apache/receipt Thu Mar 08 14:02:42 2018 +0200 3.3 @@ -1,99 +1,92 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="apache" 3.7 -VERSION="2.4.16" 3.8 +VERSION="2.4.28" 3.9 CATEGORY="network" 3.10 -SHORT_DESC="Secure, efficient and extensible HTTP server." 3.11 +SHORT_DESC="Secure, efficient and extensible HTTP server" 3.12 MAINTAINER="pascal.bellard@slitaz.org" 3.13 LICENSE="Apache" 3.14 -SOURCE="httpd" 3.15 -TARBALL="$SOURCE-$VERSION.tar.bz2" 3.16 WEB_SITE="http://www.apache.org/" 3.17 -WGET_URL="${WEB_SITE}dist/$SOURCE/$TARBALL" 3.18 + 3.19 +TARBALL="httpd-$VERSION.tar.bz2" 3.20 +WGET_URL="http://www.apache.org/dist/httpd/$TARBALL" 3.21 3.22 BUILD_DEPENDS="apr-util-dev apr-dev openssl-dev sed expat-dev zlib-dev \ 3.23 util-linux-uuid-dev openldap-dev bash pcre-dev" 3.24 -SPLIT="apache apache-dev apache-doc" 3.25 +SPLIT="apache-dev apache-doc apache" 3.26 3.27 -# Rules to configure and make the package. 3.28 -compile_rules() 3.29 -{ 3.30 +compile_rules() { 3.31 grep -q Slitaz config.layout || \ 3.32 cat $stuff/slitaz.layout >> config.layout 3.33 - ./configure --mandir=/usr/share/man \ 3.34 + sed -i 's|mkdir |mkdir -p |' build/mkdir.sh 3.35 + 3.36 + ./configure \ 3.37 + --mandir=/usr/share/man \ 3.38 --enable-mods-shared=all \ 3.39 --enable-proxy \ 3.40 --enable-ssl \ 3.41 - --enable-layout=Slitaz $CONFIGURE_ARGS && 3.42 - make $MAKEFLAGS && make DESTDIR=$DESTDIR install 3.43 -} 3.44 + --enable-layout=Slitaz \ 3.45 + $CONFIGURE_ARGS && 3.46 + make $MAKEFLAGS && make DESTDIR=$DESTDIR install || return 1 3.47 3.48 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.49 -genpkg_rules() 3.50 -{ 3.51 - case $PACKAGE in 3.52 - apache) 3.53 - CONFIG_FILES="/etc/apache /var/www /etc/ssl/apache" 3.54 - TAZPANEL_DAEMON="edit::/etc/apache/httpd.conf|web::$WEB_SITE" 3.55 - PROVIDE="lighttpd" 3.56 - TAGS="webserver http server" 3.57 - DEPENDS="apr-util apr openssl pcre util-linux-uuid expat zlib" 3.58 - mkdir -p $fs/usr/share/apache $fs/etc/init.d $fs/etc/apache/conf.d 3.59 - mkdir -p $fs/etc/ssl/apache 3.60 - cp -a $install/usr/share/apache/icons $fs/usr/share/apache 3.61 - cp -a $install/usr/share/apache/error $fs/usr/share/apache 3.62 - cp -a $install/usr/share/apache/modules $fs/usr/share/apache 3.63 - cp -a $install/usr/bin $fs/usr 3.64 - rm -r $fs/usr/bin/apxs 3.65 - cp -a $install/etc $fs 3.66 - rm -rf $fs/etc/apache/original 3.67 - cp -a $install/var $fs 3.68 - 3.69 - cp -a $stuff/apache $fs/etc/init.d 3.70 - mkdir -p $fs/etc/apache/extra 3.71 - cp -a $stuff/fix-range-CVE-2011-3192.conf $fs/etc/apache/extra 3.72 + install -Dm755 $stuff/apache $install/etc/init.d/apache 3.73 3.74 - sed -i -e 's|User daemon|User www|' -e 's|Group daemon|Group www|' \ 3.75 - -e 's|ServerAdmin you@example.com|ServerAdmin root@localhost|' \ 3.76 - -e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \ 3.77 - -e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \ 3.78 - -e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \ 3.79 - -e 's|#LoadModule ssl_module|LoadModule ssl_module|' \ 3.80 - $fs/etc/apache/httpd.conf $fs/etc/apache/extra/httpd-ssl.conf 3.81 - echo "Include /etc/apache/conf.d" >> $fs/etc/apache/httpd.conf 3.82 - sed -i 's/^SSLSessionCache /#&/' $fs/etc/apache/extra/httpd-ssl.conf 3.83 - cat >> $fs/etc/apache/extra/httpd-ssl.conf <<EOT 3.84 + mkdir -p $install/etc/apache/extra/ 3.85 + cp -a $stuff/fix-range-CVE-2011-3192.conf $install/etc/apache/extra/ 3.86 + 3.87 + sed -i \ 3.88 + -e 's|User daemon|User www|' \ 3.89 + -e 's|Group daemon|Group www|' \ 3.90 + -e 's|ServerAdmin you@example.com|ServerAdmin root@localhost|' \ 3.91 + -e 's|#Include /etc/apache/extra/httpd-ssl.conf|Include /etc/apache/extra/httpd-ssl.conf|' \ 3.92 + -e 's|/etc/apache/server.crt|/etc/ssl/apache/apache.pem|' \ 3.93 + -e 's|/etc/apache/server.key|/etc/ssl/apache/apache.pem|' \ 3.94 + -e 's|#LoadModule ssl_module|LoadModule ssl_module|' \ 3.95 + $install/etc/apache/httpd.conf \ 3.96 + $install/etc/apache/extra/httpd-ssl.conf 3.97 + 3.98 + echo "Include /etc/apache/conf.d" >> $install/etc/apache/httpd.conf 3.99 + sed -i 's/^SSLSessionCache /#&/' $install/etc/apache/extra/httpd-ssl.conf 3.100 + cat >> $install/etc/apache/extra/httpd-ssl.conf <<EOT 3.101 3.102 # Unsafe, see CVE-2014-3566 POODLE 3.103 SSLProtocol All -SSLv2 -SSLv3 3.104 EOT 3.105 - ;; 3.106 - apache-dev) 3.107 - CAT="development|HTTP server development files." 3.108 - mkdir -p $fs/usr/share/apache $fs/usr/bin 3.109 - cp -a $install/usr/include $fs/usr 3.110 - cp -a $install/usr/bin/apxs $fs/usr/bin 3.111 - cp -a $install/usr/share/apache/build $fs/usr/share/apache 3.112 - ;; 3.113 - apache-doc) 3.114 - CAT="development|HTTP server documentation files." 3.115 - mkdir -p $fs/usr/share 3.116 - cp -a $install/usr/share/doc $fs/usr/share 3.117 - ;; 3.118 + 3.119 + chown -R root:root $install 3.120 +} 3.121 + 3.122 +genpkg_rules() { 3.123 + case $PACKAGE in 3.124 + apache-dev) 3.125 + copy @dev apxs /usr/share/apache/build/ 3.126 + rm -r $fs/usr/share/apache/error/ # here folder 'include' 3.127 + ;; 3.128 + apache-doc) 3.129 + copy /usr/share/doc/ 3.130 + CAT="development|documentation" 3.131 + ;; 3.132 + apache) 3.133 + copy @std @rm /usr/share/apache/error/include/ 3.134 + rm -rf $fs/etc/apache/original/ 3.135 + CONFIG_FILES="/etc/apache/ /var/www/ /etc/ssl/apache/" 3.136 + TAZPANEL_DAEMON="edit::/etc/apache/httpd.conf|web::$WEB_SITE" 3.137 + PROVIDE="lighttpd" 3.138 + TAGS="webserver http server" 3.139 + DEPENDS="apr-util apr openssl pcre util-linux-uuid expat zlib" 3.140 + ;; 3.141 esac 3.142 } 3.143 3.144 -# Pre and post install commands for Tazpkg. 3.145 # We stop the server by default in case of upgarde. 3.146 -pre_install_apache() 3.147 -{ 3.148 - [ -z "$1" ] && for i in httpd lighttpd ngnix cherokee $PACKAGE ; do 3.149 +pre_install_apache() { 3.150 + [ -n "$1" ] || 3.151 + for i in httpd lighttpd ngnix cherokee $PACKAGE ; do 3.152 [ -f /etc/init.d/$i ] && /etc/init.d/$i stop 3.153 done 3.154 } 3.155 3.156 -post_install_apache() 3.157 -{ 3.158 +post_install_apache() { 3.159 local lang=$(. $1/etc/locale.conf 2>/dev/null; echo ${LANG#*_}) 3.160 local tz=$(cat $1/etc/TZ 2>/dev/null) 3.161 local hostname=$(cat $1/etc/hostname 2>/dev/null) 3.162 @@ -131,9 +124,3 @@ 3.163 [ "$1" ] || netstat -ltn 2> /dev/null | grep -q :80 || 3.164 /etc/init.d/$PACKAGE start 3.165 } 3.166 - 3.167 -# Rules to clean extras dirs or files 3.168 -clean_wok() 3.169 -{ 3.170 - rm -rf $WOK/$PACKAGE/${PACKAGE}.${VERSION} 3.171 -}
4.1 --- a/apcupsd/receipt Thu Mar 08 02:34:55 2018 +0200 4.2 +++ b/apcupsd/receipt Thu Mar 08 14:02:42 2018 +0200 4.3 @@ -1,20 +1,19 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="apcupsd" 4.8 -VERSION="3.14.9" 4.9 +VERSION="3.14.14" 4.10 CATEGORY="system-tools" 4.11 SHORT_DESC="APC UPS Power Management (daemon)" 4.12 MAINTAINER="devel@slitaz.org" 4.13 LICENSE="GPL2" 4.14 +WEB_SITE="http://www.apcupsd.com/" 4.15 + 4.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.17 -WEB_SITE="http://www.apcupsd.com/" 4.18 -WGET_URL="http://netcologne.dl.sourceforge.net/project/$PACKAGE/$PACKAGE%20-%20Stable/$VERSION/$TARBALL" 4.19 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 4.20 4.21 -BUILD_DEPENDS="slitaz-dev-pkgs libgd-dev libgd" 4.22 +BUILD_DEPENDS="libgd-dev" 4.23 4.24 -# Rules to configure and make the package. 4.25 -compile_rules() 4.26 -{ 4.27 +compile_rules() { 4.28 sed -i 's/src platforms doc/src platforms/' Makefile 4.29 SHUTDOWN=/sbin/poweroff ac_cv_func_setpgrp_void=yes ./configure \ 4.30 --enable-usb \ 4.31 @@ -28,14 +27,12 @@ 4.32 --infodir=/usr/share/info \ 4.33 --mandir=/usr/share/man \ 4.34 $CONFIGURE_ARGS && 4.35 - make && make install 4.36 + make && make install || return 1 4.37 4.38 cook_pick_manpages $src/doc/*.5 $src/doc/*.8 4.39 } 4.40 4.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 4.42 -genpkg_rules() 4.43 -{ 4.44 - cp -a $install/* $fs 4.45 - rm -r $fs/usr/share/man 4.46 +genpkg_rules() { 4.47 + copy @std 4.48 + DEPENDS="libgd" 4.49 }