wok-next rev 20879

mate-session-manager: update bdeps; ntop: up (5.0.1); sslh: normalize receipt
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Jul 07 16:28:22 2018 +0300 (2018-07-07)
parents ca0d3fe02f15
children e99bd65b617a
files mate-session-manager/.icon.png mate-session-manager/receipt ntop/receipt ntop/stuff/patches/ntop-rrdtool-1.6.0.patch ntop/stuff/patches/series sslh/receipt
line diff
     1.1 Binary file mate-session-manager/.icon.png has changed
     2.1 --- a/mate-session-manager/receipt	Sat Jul 07 14:25:00 2018 +0300
     2.2 +++ b/mate-session-manager/receipt	Sat Jul 07 16:28:22 2018 +0300
     2.3 @@ -12,21 +12,19 @@
     2.4  WGET_URL="https://github.com/mate-desktop/mate-session-manager/archive/v$VERSION.tar.gz"
     2.5  
     2.6  BUILD_DEPENDS="mate-common gtk+3-dev dbus-glib-dev xorg-libXtst-dev xmlto \
     2.7 -libxslt-dev libwrap-dev docbook-xsl"
     2.8 +libxslt-dev libwrap-dev docbook-xsl xorg-libSM-dev xorg-xtrans"
     2.9  
    2.10  compile_rules() {
    2.11  	./autogen.sh \
    2.12  		$CONFIGURE_ARGS &&
    2.13 +	fix libtool &&
    2.14  	make &&
    2.15  	make install
    2.16  }
    2.17  
    2.18  genpkg_rules() {
    2.19  	copy @std @ico # only 16 and 48 icons
    2.20 -	DEPENDS="atk bzlib cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
    2.21 -	glib gtk+3 libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \
    2.22 -	util-linux-blkid util-linux-mount util-linux-uuid xorg-libICE xorg-libSM \
    2.23 -	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXi \
    2.24 -	xorg-libXrender xorg-libXtst xorg-libxcb xorg-pixman zlib"
    2.25 +	DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+3 xorg-libICE xorg-libSM \
    2.26 +	xorg-libX11 xorg-libXau xorg-libXext xorg-libXrender xorg-libXtst"
    2.27  	TAGS="MATE"
    2.28  }
     3.1 --- a/ntop/receipt	Sat Jul 07 14:25:00 2018 +0300
     3.2 +++ b/ntop/receipt	Sat Jul 07 16:28:22 2018 +0300
     3.3 @@ -1,42 +1,49 @@
     3.4  # SliTaz package receipt v2.
     3.5  
     3.6  PACKAGE="ntop"
     3.7 -VERSION="4.1.0"
     3.8 +VERSION="5.0.1"
     3.9  CATEGORY="network"
    3.10  SHORT_DESC="Network traffic probe"
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12  LICENSE="GPL3"
    3.13 -WEB_SITE="http://www.ntop.org/"
    3.14 +WEB_SITE="https://www.ntop.org/"
    3.15  
    3.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    3.18  
    3.19 -BUILD_DEPENDS="zlib-dev openssl-dev libpng16-dev libpcap-dev libtool \
    3.20 -glibc-dev gdbm-dev rrdtool autoconf automake rrdtool-dev geoip-dev \
    3.21 -libwrap libtool"
    3.22 +BUILD_DEPENDS="libtool automake autoconf wget subversion libpcap-dev gdbm-dev \
    3.23 +pcre-dev rrdtool-dev openssl-dev zlib-dev python-dev geoip-dev"
    3.24  SPLIT="ntop-dev ntop-man"
    3.25 +COOKOPTS="skip-log-errors"
    3.26  
    3.27  compile_rules() {
    3.28  	./autogen.sh \
    3.29 +		--prefix=/usr \
    3.30 +		--sysconfdir=/usr/share \
    3.31  		--localstatedir=/var/lib \
    3.32 +		--disable-snmp \
    3.33  		$CONFIGURE_ARGS &&
    3.34  	make &&
    3.35 -	make install || return 1
    3.36 +	make install-recursive || return 1
    3.37  
    3.38 -	#~ && make install-data-as
    3.39 +	mkdir -p $install/var/lib/ntop $install/var/lib/ntop/rrd
    3.40  
    3.41 -	chown -R www.www $install/usr/share/ntop/
    3.42 +	for i in $install/usr/lib/ntop/plugins/*.so; do
    3.43 +		ln -sf "../../lib$(basename $i)" $i
    3.44 +	done
    3.45 +
    3.46  	install -Dm755 $stuff/ntop $install/etc/init.d/ntop
    3.47  	mkdir -p $install/var/log/ntop/
    3.48 +	chown -R root:root $install
    3.49  }
    3.50  
    3.51  genpkg_rules() {
    3.52  	case $PACKAGE in
    3.53  		ntop)
    3.54  			copy @std
    3.55 +			chown -R www:www $fs/usr/share/ntop/
    3.56  			CONFIG_FILES="/etc/ntop/"
    3.57 -			DEPENDS="zlib openssl libpng16 libpcap glibc gdbm rrdtool perl \
    3.58 -			pcre geoip libwrap"
    3.59 +			DEPENDS="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng16 perl pcre libwrap
    3.60  			TAGS="network"
    3.61  			;;
    3.62  		ntop-dev)
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/ntop/stuff/patches/ntop-rrdtool-1.6.0.patch	Sat Jul 07 16:28:22 2018 +0300
     4.3 @@ -0,0 +1,29 @@
     4.4 +diff -up ntop-5.0.1/configure.in.rrdtool ntop-5.0.1/configure.in
     4.5 +--- ntop-5.0.1/configure.in.rrdtool	2016-10-16 20:32:46.194496951 +0200
     4.6 ++++ ntop-5.0.1/configure.in	2016-10-16 20:32:57.392486940 +0200
     4.7 +@@ -893,19 +893,19 @@ else
     4.8 +    fi
     4.9 + fi
    4.10 + 
    4.11 +-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
    4.12 ++RRD_LIB="-L${RRD_HOME}/lib -lrrd"
    4.13 + 
    4.14 +-if test -f "$RRD_HOME/lib/librrd_th.so"; then
    4.15 ++if test -f "$RRD_HOME/lib/librrd.so"; then
    4.16 +    AC_MSG_RESULT(checking for rrdtool... yes)
    4.17 + else
    4.18 +-  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
    4.19 ++  if test -f "$RRD_HOME/lib/librrd.dylib"; then # OSX
    4.20 +      AC_MSG_RESULT(checking for rrdtool... yes)
    4.21 +   else
    4.22 +-     if test -f "$RRD_HOME/lib/librrd_th.a"; then
    4.23 ++     if test -f "$RRD_HOME/lib/librrd.a"; then
    4.24 +        AC_MSG_RESULT(checking for rrdtool... yes)
    4.25 +      else
    4.26 +-       AC_CHECK_LIB([rrd_th], [main])
    4.27 +-       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
    4.28 ++       AC_CHECK_LIB([rrd], [main])
    4.29 ++       if test ".${ac_cv_lib_rrd_main}" != ".yes"; then
    4.30 +          AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
    4.31 + 	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
    4.32 +        else
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/ntop/stuff/patches/series	Sat Jul 07 16:28:22 2018 +0300
     5.3 @@ -0,0 +1,2 @@
     5.4 +# from https://www.archlinux.org/packages/community/x86_64/ntop/
     5.5 +ntop-rrdtool-1.6.0.patch
     6.1 --- a/sslh/receipt	Sat Jul 07 14:25:00 2018 +0300
     6.2 +++ b/sslh/receipt	Sat Jul 07 16:28:22 2018 +0300
     6.3 @@ -1,29 +1,26 @@
     6.4 -# SliTaz package receipt.
     6.5 +# SliTaz package receipt v2.
     6.6  
     6.7  PACKAGE="sslh"
     6.8  VERSION="1.17"
     6.9  CATEGORY="network"
    6.10 -SHORT_DESC="Accept HTTPS SSH OpenVPN Tinc & XMPP connections on the same port."
    6.11 +SHORT_DESC="Accept HTTPS SSH OpenVPN Tinc & XMPP connections on the same port"
    6.12  MAINTAINER="pascal.bellard@slitaz.org"
    6.13  LICENSE="GPL2"
    6.14 +WEB_SITE="http://www.rutschle.net/tech/sslh.shtml"
    6.15 +
    6.16  TARBALL="$PACKAGE-v$VERSION.tar.gz"
    6.17 -WEB_SITE="http://www.rutschle.net/tech/sslh.shtml"
    6.18  WGET_URL="http://www.rutschle.net/tech/$TARBALL"
    6.19 -TAGS="ssh vpn tunnel"
    6.20  
    6.21 -DEPENDS="libwrap libconfig"
    6.22  BUILD_DEPENDS="libwrap-dev libwrap libconfig-dev"
    6.23  
    6.24 -# Rules to configure and make the package.
    6.25 -compile_rules()
    6.26 -{
    6.27 -	make
    6.28 +compile_rules() {
    6.29 +	make || return 1
    6.30 +	install -Dm755 sslh-fork   $install/usr/sbin/sslh-fork
    6.31 +	install -Dm755 sslh-select $install/usr/sbin/sslh-select
    6.32  }
    6.33  
    6.34 -# Rules to gen a SliTaz package suitable for Tazpkg.
    6.35 -genpkg_rules()
    6.36 -{
    6.37 -	mkdir -p $fs/usr/sbin
    6.38 -	cp -a $src/sslh-fork $fs/usr/sbin
    6.39 -	cp -a $src/sslh-select $fs/usr/sbin
    6.40 +genpkg_rules() {
    6.41 +	copy @std
    6.42 +	DEPENDS="libwrap libconfig"
    6.43 +	TAGS="ssh vpn tunnel"
    6.44  }