# HG changeset patch # User Aleksej Bobylev # Date 1530970102 -10800 # Node ID 642c924029f7823aa3179eb6b1f2c79b067886b5 # Parent ca0d3fe02f153518ccb28892c2f105bec31bec41 mate-session-manager: update bdeps; ntop: up (5.0.1); sslh: normalize receipt diff -r ca0d3fe02f15 -r 642c924029f7 mate-session-manager/.icon.png Binary file mate-session-manager/.icon.png has changed diff -r ca0d3fe02f15 -r 642c924029f7 mate-session-manager/receipt --- a/mate-session-manager/receipt Sat Jul 07 14:25:00 2018 +0300 +++ b/mate-session-manager/receipt Sat Jul 07 16:28:22 2018 +0300 @@ -12,21 +12,19 @@ WGET_URL="https://github.com/mate-desktop/mate-session-manager/archive/v$VERSION.tar.gz" BUILD_DEPENDS="mate-common gtk+3-dev dbus-glib-dev xorg-libXtst-dev xmlto \ -libxslt-dev libwrap-dev docbook-xsl" +libxslt-dev libwrap-dev docbook-xsl xorg-libSM-dev xorg-xtrans" compile_rules() { ./autogen.sh \ $CONFIGURE_ARGS && + fix libtool && make && make install } genpkg_rules() { copy @std @ico # only 16 and 48 icons - DEPENDS="atk bzlib cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \ - glib gtk+3 libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \ - util-linux-blkid util-linux-mount util-linux-uuid xorg-libICE xorg-libSM \ - xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXi \ - xorg-libXrender xorg-libXtst xorg-libxcb xorg-pixman zlib" + DEPENDS="cairo dbus dbus-glib gdk-pixbuf glib gtk+3 xorg-libICE xorg-libSM \ + xorg-libX11 xorg-libXau xorg-libXext xorg-libXrender xorg-libXtst" TAGS="MATE" } diff -r ca0d3fe02f15 -r 642c924029f7 ntop/receipt --- a/ntop/receipt Sat Jul 07 14:25:00 2018 +0300 +++ b/ntop/receipt Sat Jul 07 16:28:22 2018 +0300 @@ -1,42 +1,49 @@ # SliTaz package receipt v2. PACKAGE="ntop" -VERSION="4.1.0" +VERSION="5.0.1" CATEGORY="network" SHORT_DESC="Network traffic probe" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" -WEB_SITE="http://www.ntop.org/" +WEB_SITE="https://www.ntop.org/" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -BUILD_DEPENDS="zlib-dev openssl-dev libpng16-dev libpcap-dev libtool \ -glibc-dev gdbm-dev rrdtool autoconf automake rrdtool-dev geoip-dev \ -libwrap libtool" +BUILD_DEPENDS="libtool automake autoconf wget subversion libpcap-dev gdbm-dev \ +pcre-dev rrdtool-dev openssl-dev zlib-dev python-dev geoip-dev" SPLIT="ntop-dev ntop-man" +COOKOPTS="skip-log-errors" compile_rules() { ./autogen.sh \ + --prefix=/usr \ + --sysconfdir=/usr/share \ --localstatedir=/var/lib \ + --disable-snmp \ $CONFIGURE_ARGS && make && - make install || return 1 + make install-recursive || return 1 - #~ && make install-data-as + mkdir -p $install/var/lib/ntop $install/var/lib/ntop/rrd - chown -R www.www $install/usr/share/ntop/ + for i in $install/usr/lib/ntop/plugins/*.so; do + ln -sf "../../lib$(basename $i)" $i + done + install -Dm755 $stuff/ntop $install/etc/init.d/ntop mkdir -p $install/var/log/ntop/ + chown -R root:root $install } genpkg_rules() { case $PACKAGE in ntop) copy @std + chown -R www:www $fs/usr/share/ntop/ CONFIG_FILES="/etc/ntop/" - DEPENDS="zlib openssl libpng16 libpcap glibc gdbm rrdtool perl \ - pcre geoip libwrap" + DEPENDS="gdbm geoip libpcap openssl python rrdtool zlib" # ? libpng16 perl pcre libwrap TAGS="network" ;; ntop-dev) diff -r ca0d3fe02f15 -r 642c924029f7 ntop/stuff/patches/ntop-rrdtool-1.6.0.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ntop/stuff/patches/ntop-rrdtool-1.6.0.patch Sat Jul 07 16:28:22 2018 +0300 @@ -0,0 +1,29 @@ +diff -up ntop-5.0.1/configure.in.rrdtool ntop-5.0.1/configure.in +--- ntop-5.0.1/configure.in.rrdtool 2016-10-16 20:32:46.194496951 +0200 ++++ ntop-5.0.1/configure.in 2016-10-16 20:32:57.392486940 +0200 +@@ -893,19 +893,19 @@ else + fi + fi + +-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th" ++RRD_LIB="-L${RRD_HOME}/lib -lrrd" + +-if test -f "$RRD_HOME/lib/librrd_th.so"; then ++if test -f "$RRD_HOME/lib/librrd.so"; then + AC_MSG_RESULT(checking for rrdtool... yes) + else +- if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX ++ if test -f "$RRD_HOME/lib/librrd.dylib"; then # OSX + AC_MSG_RESULT(checking for rrdtool... yes) + else +- if test -f "$RRD_HOME/lib/librrd_th.a"; then ++ if test -f "$RRD_HOME/lib/librrd.a"; then + AC_MSG_RESULT(checking for rrdtool... yes) + else +- AC_CHECK_LIB([rrd_th], [main]) +- if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then ++ AC_CHECK_LIB([rrd], [main]) ++ if test ".${ac_cv_lib_rrd_main}" != ".yes"; then + AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR); + AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/); + else diff -r ca0d3fe02f15 -r 642c924029f7 ntop/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ntop/stuff/patches/series Sat Jul 07 16:28:22 2018 +0300 @@ -0,0 +1,2 @@ +# from https://www.archlinux.org/packages/community/x86_64/ntop/ +ntop-rrdtool-1.6.0.patch diff -r ca0d3fe02f15 -r 642c924029f7 sslh/receipt --- a/sslh/receipt Sat Jul 07 14:25:00 2018 +0300 +++ b/sslh/receipt Sat Jul 07 16:28:22 2018 +0300 @@ -1,29 +1,26 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="sslh" VERSION="1.17" CATEGORY="network" -SHORT_DESC="Accept HTTPS SSH OpenVPN Tinc & XMPP connections on the same port." +SHORT_DESC="Accept HTTPS SSH OpenVPN Tinc & XMPP connections on the same port" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://www.rutschle.net/tech/sslh.shtml" + TARBALL="$PACKAGE-v$VERSION.tar.gz" -WEB_SITE="http://www.rutschle.net/tech/sslh.shtml" WGET_URL="http://www.rutschle.net/tech/$TARBALL" -TAGS="ssh vpn tunnel" -DEPENDS="libwrap libconfig" BUILD_DEPENDS="libwrap-dev libwrap libconfig-dev" -# Rules to configure and make the package. -compile_rules() -{ - make +compile_rules() { + make || return 1 + install -Dm755 sslh-fork $install/usr/sbin/sslh-fork + install -Dm755 sslh-select $install/usr/sbin/sslh-select } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/sbin - cp -a $src/sslh-fork $fs/usr/sbin - cp -a $src/sslh-select $fs/usr/sbin +genpkg_rules() { + copy @std + DEPENDS="libwrap libconfig" + TAGS="ssh vpn tunnel" }