# HG changeset patch # User Aleksej Bobylev # Date 1520899472 -7200 # Node ID 2f03cb67a994759be2ce8f5eb6339019e8fa9790 # Parent a54030a5b01b296975974059cc7a9f4d00df2436 More packing... diff -r a54030a5b01b -r 2f03cb67a994 fpc-bootstrap/receipt --- a/fpc-bootstrap/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/fpc-bootstrap/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,38 +1,26 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="fpc-bootstrap" -VERSION="2.6.2" +VERSION="2.6.2" # last 2.x.x version is 2.6.4, and it lacks arm and x86_64 archs CATEGORY="development" -SHORT_DESC="bootstrap to compile fpc." +SHORT_DESC="Bootstrap to compile fpc" MAINTAINER="slaxemulator@gmail.com" LICENSE="GPL2 LGPL2.1" +WEB_SITE="http://freepascal.org/" + +case "$ARCH" in + arm*) BOOTSTRAP="arm-linux-ppcarm";; + x86_64) BOOTSTRAP="x86_64-linux-ppcx64";; + i?86) BOOTSTRAP="i386-linux-ppc386";; +esac TARBALL="$PACKAGE-$ARCH-$VERSION.bz2" -WEB_SITE="http://freepascal.org/" -BOOTSTRAP="i386-linux-ppc386" WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$BOOTSTRAP.bz2" -# Handle cross compilation. -case "$ARCH" in - arm*) - BOOTSTRAP="arm-linux-ppcarm" - WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$BOOTSTRAP.bz2" - ;; - x86_64) - BOOTSTRAP="x86_64-linux-ppcx64" - WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/bootstrap/$BOOTSTRAP.bz2" - ;; -esac +compile_rules() { + [ -f $src/$TARBALL ] && bunzip2 -d $src/$TARBALL + install -Dm 755 $src/${TARBALL%.bz2} $install/usr/bin/${BOOTSTRAP#*linux-} +} -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin $WOK/$PACKAGE/tmp - if [ -f $SOURCES_REPOSITORY/$TARBALL ]; then - cp $SOURCES_REPOSITORY/$TARBALL $WOK/$PACKAGE/tmp - fi - mv $WOK/$PACKAGE/tmp/$TARBALL $WOK/$PACKAGE/tmp/$BOOTSTRAP.bz2 - [ -f $WOK/$PACKAGE/tmp/$BOOTSTRAP ] && rm -f $WOK/$PACKAGE/tmp/$BOOTSTRAP - bunzip2 -d $WOK/$PACKAGE/tmp/$BOOTSTRAP.bz2 - cp -a $WOK/$PACKAGE/tmp/$BOOTSTRAP $fs/usr/bin/${BOOTSTRAP#*linux-} - chmod +x $fs/usr/bin/${BOOTSTRAP#*linux-} +genpkg_rules() { + copy @std } diff -r a54030a5b01b -r 2f03cb67a994 fpc/receipt --- a/fpc/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/fpc/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -13,9 +13,19 @@ BUILD_DEPENDS_arm="" BUILD_DEPENDS="fpc-bootstrap" +SPLIT="fpc-src fpc" + CROSS_BUGS="arm-slitaz-gnueabi-as: Command not found" compile_rules() { + sed -i 's|/man$|/share/man|' $src/install/man/Makefile # fix man install path + + case $ARCH in + arm*) Arch='arm';; + i?86) Arch='386';; + x86_64) Arch='x64';; + esac + case "$ARCH" in arm*) make crossinstall \ @@ -25,42 +35,54 @@ OPT=-dFPC_ARMEL \ CROSSBINDIR=/cross/$ARCH/tools/bin \ BINUTILSPREFIX=arm-slitaz-gnueabi- \ - INSTALL_PREFIX=$DESTDIR/usr + INSTALL_PREFIX=$install/usr ;; *) - make NOGDB=1 build && - make -j1 NOGDB=1 PREFIX=$DESTDIR/usr install + make NOGDB=1 FPC=/usr/bin/ppc$Arch build && + make -j1 NOGDB=1 FPC=/usr/bin/ppc$Arch PREFIX=$install/usr install ;; esac || return 1 # install package license install -Dm 644 $src/fpcsrc/rtl/COPYING.FPC \ - $DESTDIR/usr/share/licenses/fpc/COPYING.FPC + $install/usr/share/licenses/fpc/COPYING.FPC + + # create symlink for compiler + ln -s ../lib/fpc/$VERSION/ppc$Arch $install/usr/bin + + # config file + # mkdir -p $install/etc + # cp -a $install/usr/lib/fpc/$VERSION/samplecfg $install/etc/fpc.cfg + + # FPC sources + mkdir -p $install/usr/lib/fpc + cp -a $src/fpcsrc $install/usr/lib/fpc/src } genpkg_rules() { - mkdir -p $fs/usr $fs/etc - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr - - # create symlink for compiler - ln -s /usr/lib/$PACKAGE/$VERSION/ppc386 $fs/usr/bin - - # config file - #mkdir -p $fs/etc - #cp -a $fs/usr/lib/fpc/$VERSION/samplecfg $fs/etc/fpc.cfg - DEPENDS="ncurses" - CONFIG_FILE="/etc/fpc.cfg" - TAGS="compiler pascal" + case $PACKAGE in + fpc-src) + copy /usr/lib/fpc/src/ + CAT="development|sources requierd by the Lazarus IDE" + ;; + fpc) + copy @std @rm + DEPENDS="ncurses" + CONFIG_FILE="/etc/fpc.cfg" + TAGS="compiler pascal" + ;; + esac } post_install() { - if [ ! -f "$1/etc/fpc.cfg" ]; then + if [ ! -s "$1/etc/fpc.cfg" ]; then chroot "$1/" fpcmkcfg > /etc/fpc.cfg fi # Fix units search path - sed -i -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget!' \ + sed -i \ + -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget!' \ -e 's!^-Fu/units/$fpctarget/*!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/*!' \ - -e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/rtl!' "$1/etc/fpc.cfg" + -e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/rtl!' \ + "$1/etc/fpc.cfg" } diff -r a54030a5b01b -r 2f03cb67a994 libsdl2-ttf/receipt --- a/libsdl2-ttf/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/libsdl2-ttf/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -12,11 +12,14 @@ WGET_URL="http://www.libsdl.org/projects/SDL_ttf/release/$TARBALL" BUILD_DEPENDS="freetype-dev libsdl2-dev xorg-libX11-dev xorg-libICE-dev \ -mesa17-dev expat-dev" +mesa17-dev expat-dev xorg-libxshmfence-dev" SPLIT="libsdl2-ttf-dev" compile_rules() { - ./configure $CONFIGURE_ARGS && make && make install + fix ld + ./configure $CONFIGURE_ARGS && + fix libtool && + make && make install } genpkg_rules() { diff -r a54030a5b01b -r 2f03cb67a994 mate-screensaver/receipt --- a/mate-screensaver/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/mate-screensaver/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -13,7 +13,7 @@ BUILD_DEPENDS="mate-common xorg-libX11-dev xorg-libXScrnSaver-dev gtk+3-dev \ dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto xorg-libXext-dev \ -mesa17-dev libmatekbd-dev libnotify-gtk3-dev expat-dev" +mesa17-dev libmatekbd-dev libnotify-gtk3-dev expat-dev xorg-libxshmfence-dev" SPLIT="mate-screensaver-dev" compile_rules() { diff -r a54030a5b01b -r 2f03cb67a994 palemoon/receipt --- a/palemoon/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/palemoon/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -16,18 +16,21 @@ BUILD_DEPENDS="autoconf213 gtk+-dev yasm zip unzip iw dbus-dev dbus-glib-dev \ iw libpng16-dev gstreamer0 gstreamer0-dev gst0-plugins-base-dev gst0-plugins-base \ libvpx-dev mesa17-dev virtualenv zlib-dev bzip2-dev python-dev \ -xorg-pixman xorg-pixman-dev libffi libffi-dev libjpeg-turbo libjpeg-turbo-dev \ +xorg-pixman xorg-pixman-dev libffi libffi-dev libjpeg-turbo-dev \ xorg-libXt-dev" # sqlite sqlite-dev libevent libevent-dev -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { + find -type f | grep duckduckgo | xargs \ sed -i 's|name="t" value="palemoon"|name="t" value="slitaz"|' cp $stuff/mozconfig $src + case $ARCH in + x86_64) sed -i 's|i686|nocona|' $src/mozconfig;; + esac chmod -R +x build/autoconf/* python/* find . -name '*.sh' -exec chmod +x {} \; - export CFLAGS=${CFLAGS/486/686} && export CXXFLAGS=${CXXFLAGS/486/686} + export CFLAGS=${CFLAGS/486/686} + export CXXFLAGS=${CXXFLAGS/486/686} export MOZBUILD_STATE_PATH="$src/mozbuild" export MOZCONFIG="$src/mozconfig" export CPPFLAGS="$CPPFLAGS" @@ -45,9 +48,7 @@ $install/usr/share/applications } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { cp -a $install/* $fs mkdir -p $fs/usr/share/pixmaps rm -f /usr/lib/$PACKAGE/$PACKAGE-bin diff -r a54030a5b01b -r 2f03cb67a994 plm2c/receipt --- a/plm2c/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/plm2c/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,27 +1,24 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="plm2c" VERSION="1.02" CATEGORY="development" -SHORT_DESC="Convert PLM sources files to C language." +SHORT_DESC="Convert PLM sources files to C language" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="unknown" +WEB_SITE="http://www.cpm.z80.de/source.html" + TARBALL="newplm.zip" -WEB_SITE="http://www.cpm.z80.de/source.html" WGET_URL="http://www.cpm.z80.de/download/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { unzip PLM2C.ZIP cd plm2c sed -i '/strcat/d' misc.h - make + make && + install -Dm 755 $src/plm2c/plm2c $install/usr/bin/plm2c } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/plm2c/plm2c $fs/usr/bin +genpkg_rules() { + copy @std } diff -r a54030a5b01b -r 2f03cb67a994 pluma/receipt --- a/pluma/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/pluma/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -12,14 +12,17 @@ WGET_URL="https://github.com/mate-desktop/pluma/archive/v$VERSION.tar.gz" BUILD_DEPENDS="mate-common yelp-tools gtk-doc gobject-introspection-dev \ -enchant-dev iso-codes gtk+3-dev gtksourceview3-dev libpeas-dev itstool" +enchant-dev iso-codes gtk+3-dev gtksourceview3-dev libpeas-dev itstool \ +xorg-libSM-dev" SPLIT="pluma-dev pluma-plugins pluma" compile_rules() { + fix ld ./autogen.sh \ --sysconfdir=/etc \ --localstatedir=/var \ $CONFIGURE_ARGS && + fix libtool && make && make install } diff -r a54030a5b01b -r 2f03cb67a994 polipo/receipt --- a/polipo/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/polipo/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,50 +1,43 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="polipo" VERSION="1.1.0" CATEGORY="network" -SHORT_DESC="Small and fast caching web proxy." +SHORT_DESC="Small and fast caching web proxy" MAINTAINER="paul@slitaz.org" LICENSE="MIT" +WEB_SITE="http://www.pps.jussieu.fr/~jch/software/polipo/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.pps.jussieu.fr/~jch/software/polipo/" WGET_URL="http://www.pps.univ-paris-diderot.fr/~jch/software/files/$PACKAGE/$TARBALL" -DEPENDS="" BUILD_DEPENDS="texinfo" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - make all +compile_rules() { + make all || return 1 + + mkdir -p \ + $install/usr/bin/ \ + $install/etc/polipo/ \ + $install/usr/share/polipo/www/doc/ + cp -a $src/polipo $install/usr/bin + cp -a $src/config.sample $install/etc/polipo/config + cp -a $src/forbidden.sample $install/etc/polipo/forbidden + cp -a $src/localindex.html $install/usr/share/polipo/www/index.html + cp -a $src/html/* $install/usr/share/polipo/www/doc } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin $fs/etc/polipo $fs/usr/share/polipo/www/doc - cp -a $src/polipo $fs/usr/bin - cp -a $src/config.sample $fs/etc/polipo/config - cp -a $src/forbidden.sample $fs/etc/polipo/forbidden - cp -a $src/localindex.html $fs/usr/share/polipo/www/index.html - cp -a $src/html/* $fs/usr/share/polipo/www/doc +genpkg_rules() { + copy @std } -# Create a disk cache. -post_install() -{ - echo -n "Creating disk cache..." +# Create a disk cache. +post_install() { mkdir "$1/var/cache/polipo" - chown tux.tux "$1/var/cache/polipo" - status -} + chown tux.tux "$1/var/cache/polipo" # FIXME? tux? +} # Remove disk cache. -post_remove() -{ - echo -n "Removing disk cache..." +post_remove() { rm -rf "$1/var/cache/polipo" - status -} - +} diff -r a54030a5b01b -r 2f03cb67a994 portsentry/receipt --- a/portsentry/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/portsentry/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,34 +1,29 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="portsentry" VERSION="1.2" CATEGORY="network" -SHORT_DESC="Portscan detection daemon." +SHORT_DESC="Portscan detection daemon" MAINTAINER="pascal.bellard@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tar.gz" LICENSE="CCPL" WEB_SITE="http://sentrytools.sourceforge.net/" + +TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="$SF_MIRROR/sentrytools/$TARBALL" -DEPENDS="" -BUILD_DEPENDS="" +compile_rules() { + sed -i 's/dot $/&\\/' portsentry.c + make linux || return 1 -# Rules to configure and make the package. -compile_rules() -{ - sed -i 's/dot $/&\\/' portsentry.c - make linux -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/sbin $fs/etc/portsentry - cp -a $src/portsentry $fs/usr/sbin - cp -a $src/portsentry.conf $fs/etc/portsentry - cat > $fs/etc/portsentry/portsentry.ignore.static < $install/etc/portsentry/portsentry.ignore.static < "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/postfixadmin/" => "/usr/share/postfixadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/postfixadmin/" => "/usr/share/postfixadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop diff -r a54030a5b01b -r 2f03cb67a994 proot/receipt --- a/proot/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/proot/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,28 +1,25 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="proot" VERSION="3.2.2" CATEGORY="misc" -SHORT_DESC="User-space implementation of chroot, mount --bind, and binfmt_misc.." +SHORT_DESC="User-space implementation of chroot, mount --bind, and binfmt_misc" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://proot.me/" + TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/cedric-vincent/PRoot/archive/v$VERSION.tar.gz" -DEPENDS="talloc" -BUILD_DEPENDS="wget talloc-dev" +BUILD_DEPENDS="talloc-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { cd $src/src - make + make && + install -Dm 755 $src/src/proot $install/usr/bin/proot } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/src/proot $fs/usr/bin +genpkg_rules() { + copy @std + DEPENDS="talloc" } diff -r a54030a5b01b -r 2f03cb67a994 psyco/receipt --- a/psyco/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/psyco/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,21 +1,20 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="psyco" VERSION="1.6" CATEGORY="system-tools" -SHORT_DESC="Module which can massively speed up the execution of any Python code." +SHORT_DESC="Module which can massively speed up the execution of any Python code" MAINTAINER="pankso@slitaz.org" LICENSE="MIT" +WEB_SITE="http://psyco.sourceforge.net/" +HOST_ARCH="i486" # error: Sorry, non-32-bit platforms are not supported at all. + TARBALL="$PACKAGE-$VERSION-src.tar.gz" -WEB_SITE="http://psyco.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" -DEPENDS="python" BUILD_DEPENDS="python-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { # Fix opcodes for python 2.7 sed -i -e 's/JUMP_IF_FALSE\([: )]\)/JUMP_IF_FALSE_OR_POP\1/' \ -e 's/JUMP_IF_TRUE\([: )]\)/JUMP_IF_TRUE_OR_POP\1/' \ @@ -23,9 +22,8 @@ python setup.py install --root=$DESTDIR } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { mkdir -p $fs/usr cp -a $install/usr/lib $fs/usr + DEPENDS="python" } diff -r a54030a5b01b -r 2f03cb67a994 ptunnel/receipt --- a/ptunnel/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/ptunnel/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="ptunnel" VERSION="0.72" @@ -6,27 +6,23 @@ SHORT_DESC="ptunnel tunnels TCP using ICMP echo request" MAINTAINER="slaxemulator@gmail.com" LICENSE="BSD" -SOURCE="PingTunnel" -TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://www.cs.uit.no/~daniels/PingTunnel/" + +TARBALL="PingTunnel-$VERSION.tar.gz" WGET_URL="$WEB_SITE/$TARBALL" -DEPENDS="libpcap" BUILD_DEPENDS="libpcap-dev" -# Rules to configure and make the package. -compile_rules() -{ - make CC=${HOST_SYSTEM}-gcc +compile_rules() { + make CC=${HOST_SYSTEM}-gcc && + install -Dm 755 $src/ptunnel $install/usr/bin/ptunnel } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/ptunnel $fs/usr/bin +genpkg_rules() { + copy @std + DEPENDS="libpcap" } testsuite() { - readelf -h ${src}/ptunnel + readelf -h $src/ptunnel } diff -r a54030a5b01b -r 2f03cb67a994 pwauth/receipt --- a/pwauth/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/pwauth/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="pwauth" VERSION="2.3.10" @@ -6,22 +6,16 @@ SHORT_DESC="Support reasonably secure web auth using system password DB" MAINTAINER="pankso@slitaz.org" LICENSE="BSD" +WEB_SITE="https://code.google.com/p/pwauth/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="https://code.google.com/p/pwauth/" WGET_URL="https://pwauth.googlecode.com/files/$TARBALL" -DEPENDS="" -BUILD_DEPENDS="wget" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src && make +compile_rules() { + make && + install -Dm 755 $src/pwauth $install/usr/bin/pwauth } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/pwauth $fs/usr/bin +genpkg_rules() { + copy @std } diff -r a54030a5b01b -r 2f03cb67a994 pwnat/receipt --- a/pwnat/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/pwnat/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,27 +1,26 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="pwnat" GITHASH="1d07c2eb53171733831c0cd01e4e96a3204ec446" # 8/9/14 VERSION=${GITHASH:0:7} CATEGORY="network" -SHORT_DESC="NAT Traversal utility." +SHORT_DESC="NAT Traversal utility" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" +WEB_SITE="http://samy.pl/pwnat" + TARBALL="$PACKAGE-$VERSION.zip" -WEB_SITE="http://samy.pl/pwnat" WGET_URL="https://github.com/samyk/pwnat/archive/$GITHASH.zip" -TAGS="vpn nat traversal icmp tunnel" -# Rules to configure and make the package. -compile_rules() -{ - make +compile_rules() { + make || return 1 + + install -Dm 755 $src/pwnat $install/usr/bin/pwnat + + cook_pick_docs README* C* } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin $install/usr/share/doc - cp -a $src/pwnat $fs/usr/bin - cp -a $src/README* $src/C* $install/usr/share/doc +genpkg_rules() { + copy @std + TAGS="vpn nat traversal icmp tunnel" } diff -r a54030a5b01b -r 2f03cb67a994 qiv/receipt --- a/qiv/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/qiv/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,28 +1,25 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. + PACKAGE="qiv" VERSION="2.2.3" CATEGORY="multimedia" SHORT_DESC="Quick Image Viewer" MAINTAINER="devl547@gmail.com" LICENSE="GPL2" +WEB_SITE="http://spiegl.de/qiv/" + TARBALL="$PACKAGE-$VERSION.tgz" -WEB_SITE="http://spiegl.de/qiv/" WGET_URL="$WEB_SITE/download/$TARBALL" BUILD_DEPENDS="gtk+-dev imlib2-dev" -DEPENDS="gtk+ imlib2" -# Rules to configure and make the package. -compile_rules() -{ - cd $src +compile_rules() { sed -i 's/MAGIC = -DHAVE_MAGIC/# MAGIC = -DHAVE_MAGIC/' Makefile - make + make && + install -Dm 755 $src/qiv $install/usr/bin/qiv } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/qiv $fs/usr/bin +genpkg_rules() { + copy @std + DEPENDS="gtk+ imlib2" } diff -r a54030a5b01b -r 2f03cb67a994 quesoglc/receipt --- a/quesoglc/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/quesoglc/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -3,40 +3,35 @@ PACKAGE="quesoglc" VERSION="0.7.2" CATEGORY="x-window" -SHORT_DESC="The OpenGL Character Renderer (GLC) is a state machine that provides OpenGL programs with character rendering services via an application programming interface (API)." +SHORT_DESC="The OpenGL Character Renderer (GLC) is a state machine that \ +provides OpenGL programs with character rendering services via an application \ +programming interface (API)" MAINTAINER="slaxemulator@gmail.com" LICENSE="LGPL2.1" +WEB_SITE="http://quesoglc.sourceforge.net/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://quesoglc.sourceforge.net/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" BUILD_DEPENDS="freetype-dev fontconfig-dev freeglut-dev fribidi-dev \ -mesa-dev expat-dev xorg-libXxf86vm-dev util-linux-uuid-dev xorg-libxcb-dev \ -libxml2-dev xorg-libxshmfence-dev" +mesa17-dev expat-dev xorg-libXxf86vm-dev util-linux-uuid-dev xorg-libxcb-dev \ +libxml2-dev xorg-libxshmfence-dev libglu-mesa-dev" SPLIT="quesoglc-dev" -# Rules to configure and make the package. -compile_rules() -{ - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && +compile_rules() { + ./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in quesoglc) copy @std - DEPENDS="freetype fontconfig freeglut fribidi mesa libglu-mesa expat xorg-libXxf86vm xorg-libxcb" + DEPENDS="freetype fontconfig freeglut fribidi mesa17 libglu-mesa \ + expat xorg-libXxf86vm xorg-libxcb" ;; quesoglc-dev) copy @dev - DEPENDS="quesoglc pkg-config" ;; esac } diff -r a54030a5b01b -r 2f03cb67a994 quilt/receipt --- a/quilt/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/quilt/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,31 +1,25 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="quilt" VERSION="0.64" CATEGORY="development" -SHORT_DESC="Easily manage large numbers of patches." +SHORT_DESC="Easily manage large numbers of patches" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://savannah.nongnu.org/projects/quilt" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://savannah.nongnu.org/projects/quilt" WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL" -DEPENDS="bash perl" -BUILD_DEPENDS="diffutils" +BUILD_DEPENDS="diffutils perl" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { ./configure --prefix=/usr $CONFIGURE_ARGS && make && make BUILD_ROOT=$DESTDIR install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share - cp -a $install/usr/share/quilt $fs/usr/share/ - cp -a $install/usr/bin $fs/usr/ - cp -a $install/etc $fs/ +genpkg_rules() { + copy @std + DEPENDS="bash perl" } diff -r a54030a5b01b -r 2f03cb67a994 rcs/receipt --- a/rcs/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/rcs/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,36 +1,33 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="rcs" VERSION="5.7" CATEGORY="development" -SHORT_DESC="GNU Revision Control System." +SHORT_DESC="GNU Revision Control System" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://www.gnu.org/software/rcs/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.gnu.org/software/rcs/" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -TAGS="cvs version-control versioning" -DEPENDS="diffutils" BUILD_DEPENDS="diffutils" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - # remove busybox/diff - [ -L /usr/bin/diff ] && tazpkg get-install diffutils --forced +compile_rules() { sed -i 's,test -w a.d || cp /dev/null a.d 2>/dev/null,false,' \ src/conf.sh - ./configure --prefix=/usr $CONFIGURE_ARGS && - make + + ./configure $CONFIGURE_ARGS && + make || return 1 + + mkdir -p $install/usr/bin/ + for p in ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog; do + install -c $src/src/$p $install/usr/bin/ + done } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - for p in ci co ident merge rcs rcsclean rcsdiff rcsmerge rlog; do - install -c $src/src/$p $fs/usr/bin - done +genpkg_rules() { + copy @std + DEPENDS="diffutils" + TAGS="cvs version-control versioning" } diff -r a54030a5b01b -r 2f03cb67a994 redis/receipt --- a/redis/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/redis/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,32 +1,34 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="redis" VERSION="2.8.19" CATEGORY="database" -SHORT_DESC="Redis is an open source, BSD licensed, advanced key-value cache and store" +SHORT_DESC="Redis is an open source, BSD licensed, advanced key-value cache \ +and store" MAINTAINER="nneul@neulinger.org" LICENSE="BSD" +WEB_SITE="http://redis.io/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://redis.io/" WGET_URL="http://download.redis.io/releases/$TARBALL" -TAGS="database" + BUILD_DEPENDS="libxslt" -# Rules to configure and make the package. -compile_rules() -{ - make PREFIX=/usr +compile_rules() { + make PREFIX=/usr || return 1 + + mkdir -p \ + $install/usr/bin \ + $install/etc + cp -a $src/src/redis-cli $install/usr/bin/ + cp -a $src/src/redis-server $install/usr/bin/ + cp -a $src/src/redis-benchmark $install/usr/bin/ + cp -a $src/src/redis-check-dump $install/usr/bin/ + cp -a $src/src/redis-check-aof $install/usr/bin/ + cp -a $src/redis.conf $install/etc/ } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - mkdir -p $fs/etc - cp -a $src/src/redis-cli $fs/usr/bin - cp -a $src/src/redis-server $fs/usr/bin - cp -a $src/src/redis-benchmark $fs/usr/bin - cp -a $src/src/redis-check-dump $fs/usr/bin - cp -a $src/src/redis-check-aof $fs/usr/bin - cp -a $src/redis.conf $fs/etc +genpkg_rules() { + copy @std + TAGS="database" } diff -r a54030a5b01b -r 2f03cb67a994 reqflow/receipt --- a/reqflow/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/reqflow/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,29 +1,25 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="reqflow" VERSION="1.2.1" CATEGORY="office" -SHORT_DESC="Tool for traceability of requirements across documents." +SHORT_DESC="Tool for traceability of requirements across documents" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://goeb.github.io/reqflow/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://goeb.github.io/reqflow/" WGET_URL="https://github.com/goeb/reqflow/archive/v$VERSION.tar.gz" -DEPENDS="zlib libzip libxml2 poppler pcre" -BUILD_DEPENDS="wget zlib-dev libzip-dev libxml2-dev poppler-dev pcre-dev" +BUILD_DEPENDS="zlib-dev libzip-dev libxml2-dev poppler-dev pcre-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { CFLAGS=$(pkg-config --cflags libzip) - make 2>&1 | sed 's/\.d: No such file/.d: no such file/' + make && + install -Dm 755 $src/req $install/usr/bin/req } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/req $fs/usr/bin +genpkg_rules() { + copy @std + DEPENDS="zlib libzip libxml2 poppler pcre" } - diff -r a54030a5b01b -r 2f03cb67a994 rgzip/receipt --- a/rgzip/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/rgzip/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,28 +1,23 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="rgzip" VERSION="0" CATEGORY="system-tools" -SHORT_DESC="Rsync friendly gzip." +SHORT_DESC="Rsync friendly gzip" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" +WEB_SITE="http://svana.org/kleptog/rgzip.html" + TARBALL="$PACKAGE.c" -WEB_SITE="http://svana.org/kleptog/rgzip.html" WGET_URL="http://svana.org/kleptog/$TARBALL" -DEPENDS="busybox" # gzip -TAGS="compression" -# Rules to configure and make the package. -compile_rules() -{ - cd $src - make rgzip +compile_rules() { + make rgzip && + install -Dm 755 $src/rgzip $install/usr/bin/rgzip } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp $src/rgzip $fs/usr/bin +genpkg_rules() { + copy @std + DEPENDS="busybox" # gzip + TAGS="compression" } - diff -r a54030a5b01b -r 2f03cb67a994 rinetd/receipt --- a/rinetd/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/rinetd/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,25 +1,21 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="rinetd" VERSION="0.62" CATEGORY="network" -SHORT_DESC="internet ''redirection server''." +SHORT_DESC="Internet 'redirection server'" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://www.boutell.com/rinetd/" + TARBALL="$PACKAGE.tar.gz" -WEB_SITE="http://www.boutell.com/rinetd/" WGET_URL="${WEB_SITE}http/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - make +compile_rules() { + make && + install -Dm 755 $src/rinetd $install/usr/sbin/rinetd } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/sbin - cp -a $src/rinetd $fs/usr/sbin +genpkg_rules() { + copy @std } - diff -r a54030a5b01b -r 2f03cb67a994 rubix/receipt --- a/rubix/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/rubix/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,30 +1,27 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="rubix" VERSION="1.0.6" CATEGORY="games" -SHORT_DESC="A 3D rubiks cube game for X." +SHORT_DESC="A 3D rubiks cube game for X" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="PublicDomain" +WEB_SITE="http://sed.free.fr/rubix" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://sed.free.fr/rubix" WGET_URL="$WEB_SITE/$TARBALL" -DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp" BUILD_DEPENDS="xorg-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { ./configure \ --prefix=/usr \ $CONFIGURE_ARGS - make + make && + install -Dm 755 $src/rubix $install/usr/bin/rubix } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/rubix $fs/usr/bin +genpkg_rules() { + copy @std + DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp" } diff -r a54030a5b01b -r 2f03cb67a994 rzip/receipt --- a/rzip/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/rzip/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,4 +1,4 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="rzip" VERSION="2.1" @@ -6,26 +6,21 @@ SHORT_DESC="A compression program designed for long distance redundencies" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="https://rzip.samba.org/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="https://rzip.samba.org/" WGET_URL="${WEB_SITE}ftp/$PACKAGE/$TARBALL" -TAGS="compression archive" -DEPENDS="bzlib" BUILD_DEPENDS="wget bzip2-dev" -# Rules to configure and make the package. -compile_rules() -{ - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - $CONFIGURE_ARGS && - make +compile_rules() { + ./configure $CONFIGURE_ARGS && + make && + install -Dm 755 $src/rzip $install/usr/bin/rzip } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/rzip $fs/usr/bin +genpkg_rules() { + copy @std + DEPENDS="bzlib" + TAGS="compression archive" } diff -r a54030a5b01b -r 2f03cb67a994 sc/receipt --- a/sc/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/sc/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,31 +1,27 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="sc" VERSION="7.16" CATEGORY="office" -SHORT_DESC="Spreadsheet calculator." +SHORT_DESC="Spreadsheet calculator" MAINTAINER="paul@slitaz.org" LICENSE="PublicDomain" +WEB_SITE="http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/" WGET_URL="http://www.ibiblio.org/pub/Linux/apps/financial/spreadsheet/$TARBALL" -DEPENDS="ncurses" BUILD_DEPENDS="ncurses-dev bison m4" -# Rules to configure and make the package. -compile_rules() -{ - patch -p1 < $stuff/7.16.patch || return 1 - make +compile_rules() { + make || return 1 + + for i in sc psc scqref; do + install -Dm 755 $src/$i $install/usr/bin/$i + done } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - - for i in sc psc scqref; do - cp -a $src/$i $fs/usr/bin - done +genpkg_rules() { + copy @std + DEPENDS="ncurses" } diff -r a54030a5b01b -r 2f03cb67a994 sc/stuff/7.16.patch --- a/sc/stuff/7.16.patch Mon Mar 12 11:53:39 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,497 +0,0 @@ ---- sc-7.16.orig/sc.h -+++ sc-7.16/sc.h -@@ -612,6 +612,9 @@ - extern int rowlimit; - extern int collimit; - -+void yankr(struct ent *v1, struct ent *v2); -+ -+ - #if BSD42 || SYSIII - - #ifndef cbreak ---- sc-7.16.orig/cmds.c -+++ sc-7.16/cmds.c -@@ -478,7 +478,7 @@ - int i, qtmp; - char buf[50]; - struct frange *fr; -- struct ent *obuf; -+ struct ent *obuf=0; - - if ((fr = find_frange(currow, curcol))) - rs = fr->or_right->row - currow + 1; -@@ -535,7 +535,7 @@ - int cs = maxcol - curcol + 1; - int i, qtmp; - char buf[50]; -- struct ent *obuf; -+ struct ent *obuf=0; - - if (cs - arg < 0) { - cs = cs > 0 ? cs : 0; -@@ -810,7 +810,7 @@ - - if (to_insert == 'r') { - insertrow(numrows, 0); -- if (fr = find_frange(currow, curcol)) -+ if ((fr = find_frange(currow, curcol))) - deltac = fr->or_left->col - mincol; - else { - for (i = 0; i < numrows; i++) -@@ -2279,7 +2279,7 @@ - ret->e.r.right.vp = lookat(newrow, newcol); - ret->e.r.right.vf = e->e.r.right.vf; - } else { -- struct enode *temprange; -+ struct enode *temprange=0; - - if (freeenodes) { - ret = freeenodes; -@@ -2337,8 +2337,7 @@ - break; - case 'f': - case 'F': -- if (range && ret->op == 'F' || -- !range && ret->op == 'f') -+ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) - Rdelta = Cdelta = 0; - ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, - r1, c1, r2, c2, transpose); -@@ -2798,7 +2797,7 @@ - write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) - { - register struct ent **pp; -- int r, c, rs, cs, mf; -+ int r, c, rs=0, cs=0, mf; - char *dpointptr; - - mf = modflg; -@@ -2861,12 +2860,12 @@ - if ((plugin = findplugin(p+1, 'w')) != NULL) { - if (!plugin_exists(plugin, strlen(plugin), save + 1)) { - error("plugin not found"); -- return; -+ return -1; - } - *save = '|'; - if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { - error("Path too long"); -- return; -+ return -1; - } - sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); - sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); -@@ -2883,13 +2882,14 @@ - } - #endif /* VMS */ - -- if (*fname == '\0') -+ if (*fname == '\0'){ - if (isatty(STDOUT_FILENO) || *curfile != '\0') - fname = curfile; - else { - write_fd(stdout, r0, c0, rn, cn); - return (0); - } -+ } - - #ifdef MSDOS - namelen = 12; -@@ -2981,12 +2981,12 @@ - if ((plugin = findplugin(p+1, 'r')) != NULL) { - if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { - error("plugin not found"); -- return; -+ return -1; - } - *save = '|'; - if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { - error("Path too long"); -- return; -+ return -1; - } - sprintf(save + strlen(save), " \"%s\"", fname); - eraseflg = 0; ---- sc-7.16.orig/abbrev.c -+++ sc-7.16/abbrev.c -@@ -19,10 +19,15 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - static struct abbrev *abbr_base; - -+int are_abbrevs(void); -+ -+ - void - add_abbr(char *string) - { -@@ -87,7 +92,7 @@ - } - } - -- if (expansion == NULL) -+ if (expansion == NULL){ - if ((a = find_abbr(string, strlen(string), &prev))) { - error("abbrev \"%s %s\"", a->abbr, a->exp); - return; -@@ -95,6 +100,7 @@ - error("abreviation \"%s\" doesn't exist", string); - return; - } -+ } - - if (find_abbr(string, strlen(string), &prev)) - del_abbr(string); -@@ -122,7 +128,7 @@ - del_abbr(char *abbrev) - { - struct abbrev *a; -- struct abbrev **prev; -+ struct abbrev **prev=0; - - if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) - return; ---- sc-7.16.orig/range.c -+++ sc-7.16/range.c -@@ -18,6 +18,8 @@ - - #include - #include -+#include -+#include - #include "sc.h" - - static struct range *rng_base; ---- sc-7.16.orig/vi.c -+++ sc-7.16/vi.c -@@ -17,6 +17,8 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - #if defined(REGCOMP) -@@ -40,7 +42,7 @@ - - #define istext(a) (isalnum(a) || ((a) == '_')) - --#define bool int -+/*#define bool int*/ - #define true 1 - #define false 0 - -@@ -667,8 +669,10 @@ - static struct range *nextmatch; - int len; - -- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || -- (completethis && line[linelim-1] == ' ')) { -+ if ((linelim > 0 && isalnum(line[linelim-1])) || -+ line[linelim-1] == '_' || -+ (completethis && line[linelim-1] == ' ')) { -+ - if (!completethis) { - for (completethis = line + linelim - 1; isalnum(*completethis) || - *completethis == '_'; completethis--) /* */; -@@ -715,7 +719,7 @@ - showdr() - { - int minsr, minsc, maxsr, maxsc; -- char *p; -+ /*char *p;*/ - char r[12]; - struct frange *fr = find_frange(currow, curcol); - -@@ -1566,7 +1570,7 @@ - search_again(bool reverse) - { - int prev_match; -- int found_it; -+ int found_it=0; - #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) - char *look_here; - int do_next; -@@ -1777,7 +1781,7 @@ - static void - match_paren() - { -- register int i; -+ /*register int i;*/ - int nest = 1; - int tmp = linelim; - ---- sc-7.16.orig/vmtbl.c -+++ sc-7.16/vmtbl.c -@@ -16,6 +16,7 @@ - # include - #endif /* PSC */ - -+#include - #include "sc.h" - - /* ---- sc-7.16.orig/Makefile -+++ sc-7.16/Makefile -@@ -32,7 +32,7 @@ - - # This is where the library file (tutorial) goes. - #LIBDIR=/usr/local/share/$(name) # reno --LIBDIR=${prefix}/lib/$(name) -+LIBDIR=${prefix}/share/doc/$(name) - LIBRARY=-DLIBDIR=\"${LIBDIR}\" - - # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up ---- sc-7.16.orig/color.c -+++ sc-7.16/color.c -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include "sc.h" - - /* a linked list of free [struct ent]'s, uses .next as the pointer */ ---- sc-7.16.orig/frame.c -+++ sc-7.16/frame.c -@@ -18,6 +18,9 @@ - - #include - #include -+#include -+#include -+#include - #include "sc.h" - - static struct frange *frame_base; ---- sc-7.16.orig/sc.c -+++ sc-7.16/sc.c -@@ -212,7 +212,7 @@ - - if (dbidx < 0) - return; -- if (p = delbuf[dbidx]) { -+ if ((p = delbuf[dbidx])) { - scxfree(delbuffmt[dbidx]); - delbuffmt[dbidx] = NULL; - } -@@ -845,7 +845,7 @@ - break; - case 'C': - color = !color; -- if (has_colors()) -+ if (has_colors()){ - if (color) { - attron(COLOR_PAIR(1)); - bkgd(COLOR_PAIR(1) | ' '); -@@ -853,6 +853,7 @@ - attron(COLOR_PAIR(0)); - bkgd(COLOR_PAIR(0) | ' '); - } -+ } - error("Color %sabled.", color ? "en" : "dis"); - break; - case 'N': ---- sc-7.16.orig/sort.c -+++ sc-7.16/sort.c -@@ -19,6 +19,8 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - int compare(const void *row1, const void *row2); ---- sc-7.16.orig/xmalloc.c -+++ sc-7.16/xmalloc.c -@@ -4,11 +4,12 @@ - */ - - #include -+#include - #include "sc.h" - --extern char *malloc(); -+/* extern char *malloc(); - extern char *realloc(); --extern void free(); -+extern void free(); */ - void fatal(); - - #ifdef SYSV3 ---- sc-7.16.orig/screen.c -+++ sc-7.16/screen.c -@@ -234,11 +234,12 @@ - i = stcol; - lcols = 0; - col = rescol + frcols; -- if (fr && stcol >= fr->or_left->col) -+ if (fr && stcol >= fr->or_left->col){ - if (stcol < fr->ir_left->col) - i = fr->or_left->col; - else - col += flcols; -+ } - for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && - i < maxcols; i++) { - lcols++; -@@ -328,11 +329,12 @@ - i = stcol; - lcols = 0; - col = rescol + frcols; -- if (fr && stcol >= fr->or_left->col) -+ if (fr && stcol >= fr->or_left->col){ - if (stcol < fr->ir_left->col) - i = fr->or_left->col; - else - col += flcols; -+ } - for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && - i < maxcols; i++) { - lcols++; -@@ -377,11 +379,12 @@ - i = strow; - rows = 0; - row = RESROW + fbrows; -- if (fr && strow >= fr->or_left->row) -+ if (fr && strow >= fr->or_left->row){ - if (strow < fr->ir_left->row) - i = fr->or_left->row; - else - row += ftrows; -+ } - for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; - i++) { - rows++; -@@ -460,11 +463,12 @@ - i = strow; - rows = 0; - row = RESROW + fbrows; -- if (fr && strow >= fr->or_left->row) -+ if (fr && strow >= fr->or_left->row){ - if (strow < fr->ir_left->row) - i = fr->or_left->row; - else - row += ftrows; -+ } - for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; - i++) { - rows++; ---- sc-7.16.orig/lex.c -+++ sc-7.16/lex.c -@@ -34,6 +34,8 @@ - #include - #include - #include -+#include -+#include - #include "sc.h" - - #ifdef NONOTIMEOUT -@@ -107,7 +109,7 @@ - yylex() - { - char *p = line + linelim; -- int ret; -+ int ret=0; - static int isfunc = 0; - static bool isgoto = 0; - static bool colstate = 0; -@@ -326,7 +328,7 @@ - strcpy((char *)path, HomeDir); - strcat((char *)path, "/.sc/plugins/"); - strncat((char *)path, name, len); -- if (fp = fopen((char *)path, "r")) { -+ if ((fp = fopen((char *)path, "r"))) { - fclose(fp); - return 1; - } -@@ -334,7 +336,7 @@ - strcpy((char *)path, LIBDIR); - strcat((char *)path, "/plugins/"); - strncat((char *)path, name, len); -- if (fp = fopen((char *)path, "r")) { -+ if ((fp = fopen((char *)path, "r"))) { - fclose(fp); - return 1; - } ---- sc-7.16.orig/interp.c -+++ sc-7.16/interp.c -@@ -1572,12 +1572,12 @@ - copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2) - { - struct ent *p; -- struct ent *n; -+/* struct ent *n;*/ - static int minsr = -1, minsc = -1; - static int maxsr = -1, maxsc = -1; - int mindr, mindc; - int maxdr, maxdc; -- int vr, vc; -+/* int vr, vc;*/ - int r, c; - int deltar, deltac; - -@@ -2066,7 +2066,7 @@ - *line = '\0'; - } - } -- if (!col_hidden[c]) -+ if (!col_hidden[c]){ - if (gs.g_type == G_STR) { - if (p && p->label - #if defined(REGCOMP) -@@ -2099,6 +2099,7 @@ - #endif - #endif - break; -+ } - if (r == endr && c == endc) { - error("String not found"); - #if defined(REGCOMP) -@@ -2471,13 +2472,11 @@ - int - constant(register struct enode *e) - { -- return ( -- e == NULL -+ return e == NULL - || e->op == O_CONST - || e->op == O_SCONST -- || e->op == 'm' && constant(e->e.o.left) -- || ( -- e->op != O_VAR -+ || (e->op == 'm' && constant(e->e.o.left)) -+ || (e->op != O_VAR - && !(e->op & REDUCE) - && constant(e->e.o.left) - && constant(e->e.o.right) -@@ -2491,9 +2490,7 @@ - && e->op != LASTCOL - && e->op != NUMITER - && e->op != FILENAME -- && optimize -- ) -- ); -+ && optimize ); - } - - void ---- sc-7.16.orig/help.c -+++ sc-7.16/help.c -@@ -11,6 +11,7 @@ - char *revision = "$Revision: 7.16 $"; - #else - #include -+#include - #include "sc.h" - #endif /* QREF */ - diff -r a54030a5b01b -r 2f03cb67a994 sc/stuff/patches/7.16.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sc/stuff/patches/7.16.patch Tue Mar 13 02:04:32 2018 +0200 @@ -0,0 +1,497 @@ +--- sc-7.16.orig/sc.h ++++ sc-7.16/sc.h +@@ -612,6 +612,9 @@ + extern int rowlimit; + extern int collimit; + ++void yankr(struct ent *v1, struct ent *v2); ++ ++ + #if BSD42 || SYSIII + + #ifndef cbreak +--- sc-7.16.orig/cmds.c ++++ sc-7.16/cmds.c +@@ -478,7 +478,7 @@ + int i, qtmp; + char buf[50]; + struct frange *fr; +- struct ent *obuf; ++ struct ent *obuf=0; + + if ((fr = find_frange(currow, curcol))) + rs = fr->or_right->row - currow + 1; +@@ -535,7 +535,7 @@ + int cs = maxcol - curcol + 1; + int i, qtmp; + char buf[50]; +- struct ent *obuf; ++ struct ent *obuf=0; + + if (cs - arg < 0) { + cs = cs > 0 ? cs : 0; +@@ -810,7 +810,7 @@ + + if (to_insert == 'r') { + insertrow(numrows, 0); +- if (fr = find_frange(currow, curcol)) ++ if ((fr = find_frange(currow, curcol))) + deltac = fr->or_left->col - mincol; + else { + for (i = 0; i < numrows; i++) +@@ -2279,7 +2279,7 @@ + ret->e.r.right.vp = lookat(newrow, newcol); + ret->e.r.right.vf = e->e.r.right.vf; + } else { +- struct enode *temprange; ++ struct enode *temprange=0; + + if (freeenodes) { + ret = freeenodes; +@@ -2337,8 +2337,7 @@ + break; + case 'f': + case 'F': +- if (range && ret->op == 'F' || +- !range && ret->op == 'f') ++ if ((range && ret->op == 'F') || (!range && ret->op == 'f')) + Rdelta = Cdelta = 0; + ret->e.o.left = copye(e->e.o.left, Rdelta, Cdelta, + r1, c1, r2, c2, transpose); +@@ -2798,7 +2797,7 @@ + write_cells(register FILE *f, int r0, int c0, int rn, int cn, int dr, int dc) + { + register struct ent **pp; +- int r, c, rs, cs, mf; ++ int r, c, rs=0, cs=0, mf; + char *dpointptr; + + mf = modflg; +@@ -2861,12 +2860,12 @@ + if ((plugin = findplugin(p+1, 'w')) != NULL) { + if (!plugin_exists(plugin, strlen(plugin), save + 1)) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 20) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " %s%d:", coltoa(c0), r0); + sprintf(save + strlen(save), "%s%d \"%s\"", coltoa(cn), rn, fname); +@@ -2883,13 +2882,14 @@ + } + #endif /* VMS */ + +- if (*fname == '\0') ++ if (*fname == '\0'){ + if (isatty(STDOUT_FILENO) || *curfile != '\0') + fname = curfile; + else { + write_fd(stdout, r0, c0, rn, cn); + return (0); + } ++ } + + #ifdef MSDOS + namelen = 12; +@@ -2981,12 +2981,12 @@ + if ((plugin = findplugin(p+1, 'r')) != NULL) { + if (!(plugin_exists(plugin, strlen(plugin), save + 1))) { + error("plugin not found"); +- return; ++ return -1; + } + *save = '|'; + if ((strlen(save) + strlen(fname) + 2) > PATHLEN) { + error("Path too long"); +- return; ++ return -1; + } + sprintf(save + strlen(save), " \"%s\"", fname); + eraseflg = 0; +--- sc-7.16.orig/abbrev.c ++++ sc-7.16/abbrev.c +@@ -19,10 +19,15 @@ + #include + #include + #include ++#include ++#include + #include "sc.h" + + static struct abbrev *abbr_base; + ++int are_abbrevs(void); ++ ++ + void + add_abbr(char *string) + { +@@ -87,7 +92,7 @@ + } + } + +- if (expansion == NULL) ++ if (expansion == NULL){ + if ((a = find_abbr(string, strlen(string), &prev))) { + error("abbrev \"%s %s\"", a->abbr, a->exp); + return; +@@ -95,6 +100,7 @@ + error("abreviation \"%s\" doesn't exist", string); + return; + } ++ } + + if (find_abbr(string, strlen(string), &prev)) + del_abbr(string); +@@ -122,7 +128,7 @@ + del_abbr(char *abbrev) + { + struct abbrev *a; +- struct abbrev **prev; ++ struct abbrev **prev=0; + + if (!(a = find_abbr(abbrev, strlen(abbrev), prev))) + return; +--- sc-7.16.orig/range.c ++++ sc-7.16/range.c +@@ -18,6 +18,8 @@ + + #include + #include ++#include ++#include + #include "sc.h" + + static struct range *rng_base; +--- sc-7.16.orig/vi.c ++++ sc-7.16/vi.c +@@ -17,6 +17,8 @@ + #include + #include + #include ++#include ++#include + #include "sc.h" + + #if defined(REGCOMP) +@@ -40,7 +42,7 @@ + + #define istext(a) (isalnum(a) || ((a) == '_')) + +-#define bool int ++/*#define bool int*/ + #define true 1 + #define false 0 + +@@ -667,8 +669,10 @@ + static struct range *nextmatch; + int len; + +- if (linelim > 0 && isalnum(line[linelim-1]) || line[linelim-1] == '_' || +- (completethis && line[linelim-1] == ' ')) { ++ if ((linelim > 0 && isalnum(line[linelim-1])) || ++ line[linelim-1] == '_' || ++ (completethis && line[linelim-1] == ' ')) { ++ + if (!completethis) { + for (completethis = line + linelim - 1; isalnum(*completethis) || + *completethis == '_'; completethis--) /* */; +@@ -715,7 +719,7 @@ + showdr() + { + int minsr, minsc, maxsr, maxsc; +- char *p; ++ /*char *p;*/ + char r[12]; + struct frange *fr = find_frange(currow, curcol); + +@@ -1566,7 +1570,7 @@ + search_again(bool reverse) + { + int prev_match; +- int found_it; ++ int found_it=0; + #if !defined(REGCOMP) && !defined(RE_COMP) && !defined(REGCMP) + char *look_here; + int do_next; +@@ -1777,7 +1781,7 @@ + static void + match_paren() + { +- register int i; ++ /*register int i;*/ + int nest = 1; + int tmp = linelim; + +--- sc-7.16.orig/vmtbl.c ++++ sc-7.16/vmtbl.c +@@ -16,6 +16,7 @@ + # include + #endif /* PSC */ + ++#include + #include "sc.h" + + /* +--- sc-7.16.orig/Makefile ++++ sc-7.16/Makefile +@@ -32,7 +32,7 @@ + + # This is where the library file (tutorial) goes. + #LIBDIR=/usr/local/share/$(name) # reno +-LIBDIR=${prefix}/lib/$(name) ++LIBDIR=${prefix}/share/doc/$(name) + LIBRARY=-DLIBDIR=\"${LIBDIR}\" + + # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up +--- sc-7.16.orig/color.c ++++ sc-7.16/color.c +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include "sc.h" + + /* a linked list of free [struct ent]'s, uses .next as the pointer */ +--- sc-7.16.orig/frame.c ++++ sc-7.16/frame.c +@@ -18,6 +18,9 @@ + + #include + #include ++#include ++#include ++#include + #include "sc.h" + + static struct frange *frame_base; +--- sc-7.16.orig/sc.c ++++ sc-7.16/sc.c +@@ -212,7 +212,7 @@ + + if (dbidx < 0) + return; +- if (p = delbuf[dbidx]) { ++ if ((p = delbuf[dbidx])) { + scxfree(delbuffmt[dbidx]); + delbuffmt[dbidx] = NULL; + } +@@ -845,7 +845,7 @@ + break; + case 'C': + color = !color; +- if (has_colors()) ++ if (has_colors()){ + if (color) { + attron(COLOR_PAIR(1)); + bkgd(COLOR_PAIR(1) | ' '); +@@ -853,6 +853,7 @@ + attron(COLOR_PAIR(0)); + bkgd(COLOR_PAIR(0) | ' '); + } ++ } + error("Color %sabled.", color ? "en" : "dis"); + break; + case 'N': +--- sc-7.16.orig/sort.c ++++ sc-7.16/sort.c +@@ -19,6 +19,8 @@ + #include + #include + #include ++#include ++#include + #include "sc.h" + + int compare(const void *row1, const void *row2); +--- sc-7.16.orig/xmalloc.c ++++ sc-7.16/xmalloc.c +@@ -4,11 +4,12 @@ + */ + + #include ++#include + #include "sc.h" + +-extern char *malloc(); ++/* extern char *malloc(); + extern char *realloc(); +-extern void free(); ++extern void free(); */ + void fatal(); + + #ifdef SYSV3 +--- sc-7.16.orig/screen.c ++++ sc-7.16/screen.c +@@ -234,11 +234,12 @@ + i = stcol; + lcols = 0; + col = rescol + frcols; +- if (fr && stcol >= fr->or_left->col) ++ if (fr && stcol >= fr->or_left->col){ + if (stcol < fr->ir_left->col) + i = fr->or_left->col; + else + col += flcols; ++ } + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && + i < maxcols; i++) { + lcols++; +@@ -328,11 +329,12 @@ + i = stcol; + lcols = 0; + col = rescol + frcols; +- if (fr && stcol >= fr->or_left->col) ++ if (fr && stcol >= fr->or_left->col){ + if (stcol < fr->ir_left->col) + i = fr->or_left->col; + else + col += flcols; ++ } + for (; (col + fwidth[i] < cols-1 || col_hidden[i] || i < curcol) && + i < maxcols; i++) { + lcols++; +@@ -377,11 +379,12 @@ + i = strow; + rows = 0; + row = RESROW + fbrows; +- if (fr && strow >= fr->or_left->row) ++ if (fr && strow >= fr->or_left->row){ + if (strow < fr->ir_left->row) + i = fr->or_left->row; + else + row += ftrows; ++ } + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; + i++) { + rows++; +@@ -460,11 +463,12 @@ + i = strow; + rows = 0; + row = RESROW + fbrows; +- if (fr && strow >= fr->or_left->row) ++ if (fr && strow >= fr->or_left->row){ + if (strow < fr->ir_left->row) + i = fr->or_left->row; + else + row += ftrows; ++ } + for (; (row < lines || row_hidden[i] || i < currow) && i < maxrows; + i++) { + rows++; +--- sc-7.16.orig/lex.c ++++ sc-7.16/lex.c +@@ -34,6 +34,8 @@ + #include + #include + #include ++#include ++#include + #include "sc.h" + + #ifdef NONOTIMEOUT +@@ -107,7 +109,7 @@ + yylex() + { + char *p = line + linelim; +- int ret; ++ int ret=0; + static int isfunc = 0; + static bool isgoto = 0; + static bool colstate = 0; +@@ -326,7 +328,7 @@ + strcpy((char *)path, HomeDir); + strcat((char *)path, "/.sc/plugins/"); + strncat((char *)path, name, len); +- if (fp = fopen((char *)path, "r")) { ++ if ((fp = fopen((char *)path, "r"))) { + fclose(fp); + return 1; + } +@@ -334,7 +336,7 @@ + strcpy((char *)path, LIBDIR); + strcat((char *)path, "/plugins/"); + strncat((char *)path, name, len); +- if (fp = fopen((char *)path, "r")) { ++ if ((fp = fopen((char *)path, "r"))) { + fclose(fp); + return 1; + } +--- sc-7.16.orig/interp.c ++++ sc-7.16/interp.c +@@ -1572,12 +1572,12 @@ + copy(struct ent *dv1, struct ent *dv2, struct ent *v1, struct ent *v2) + { + struct ent *p; +- struct ent *n; ++/* struct ent *n;*/ + static int minsr = -1, minsc = -1; + static int maxsr = -1, maxsc = -1; + int mindr, mindc; + int maxdr, maxdc; +- int vr, vc; ++/* int vr, vc;*/ + int r, c; + int deltar, deltac; + +@@ -2066,7 +2066,7 @@ + *line = '\0'; + } + } +- if (!col_hidden[c]) ++ if (!col_hidden[c]){ + if (gs.g_type == G_STR) { + if (p && p->label + #if defined(REGCOMP) +@@ -2099,6 +2099,7 @@ + #endif + #endif + break; ++ } + if (r == endr && c == endc) { + error("String not found"); + #if defined(REGCOMP) +@@ -2471,13 +2472,11 @@ + int + constant(register struct enode *e) + { +- return ( +- e == NULL ++ return e == NULL + || e->op == O_CONST + || e->op == O_SCONST +- || e->op == 'm' && constant(e->e.o.left) +- || ( +- e->op != O_VAR ++ || (e->op == 'm' && constant(e->e.o.left)) ++ || (e->op != O_VAR + && !(e->op & REDUCE) + && constant(e->e.o.left) + && constant(e->e.o.right) +@@ -2491,9 +2490,7 @@ + && e->op != LASTCOL + && e->op != NUMITER + && e->op != FILENAME +- && optimize +- ) +- ); ++ && optimize ); + } + + void +--- sc-7.16.orig/help.c ++++ sc-7.16/help.c +@@ -11,6 +11,7 @@ + char *revision = "$Revision: 7.16 $"; + #else + #include ++#include + #include "sc.h" + #endif /* QREF */ + diff -r a54030a5b01b -r 2f03cb67a994 sc/stuff/patches/series --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sc/stuff/patches/series Tue Mar 13 02:04:32 2018 +0200 @@ -0,0 +1,1 @@ +-p1|7.16.patch diff -r a54030a5b01b -r 2f03cb67a994 scalpel/receipt --- a/scalpel/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/scalpel/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,26 +1,24 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="scalpel" VERSION="1.60" CATEGORY="system-tools" -SHORT_DESC="Frugal, high performance file carver." +SHORT_DESC="Frugal, high performance file carver" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://www.digitalforensicssolutions.com/Scalpel" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.digitalforensicssolutions.com/Scalpel" WGET_URL="$WEB_SITE/$TARBALL" -# Rules to configure and make the package. -compile_rules() -{ - cd $src && make +compile_rules() { + make || return 1 + + install -Dm 755 $src/scalpel $install/usr/bin/scalpel + install -Dm 644 $src/scalpel.conf $install/etc/scalpel.conf } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin $fs/etc - cp -a $src/scalpel $fs/usr/bin - cp -a $src/scalpel.conf $fs/etc +genpkg_rules() { + copy @std } diff -r a54030a5b01b -r 2f03cb67a994 screenlets/receipt --- a/screenlets/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/screenlets/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,43 +1,35 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="screenlets" VERSION="0.1.6" CATEGORY="system-tools" -SHORT_DESC="Desktop widgets framework." +SHORT_DESC="Desktop widgets framework" MAINTAINER="pankso@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://screenlets.org" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://screenlets.org" WGET_URL="https://launchpad.net/screenlets/trunk/$VERSION/+download/$TARBALL" -DEPENDS="python pygtk python-xdg beautifulsoup gnome-python-desktop \ -dbus-python gnome-icon-theme" -BUILD_DEPENDS="python-dev wget" +BUILD_DEPENDS="python-dev gettext" -# Rules to configure and make the package. -compile_rules() -{ - python setup.py install --root=$install +compile_rules() { + python setup.py install --root=$install || return 1 + + mkdir -p $install/etc/screenlets/ + echo '/usr' > $install/etc/screenlets/prefix } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share/icons $fs/etc/screenlets - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $install/usr/share/screenlets* $fs/usr/share - cp -a $install/usr/share/icons/hicolor $fs/usr/share/icons - echo '/usr' > $fs/etc/screenlets/prefix +genpkg_rules() { + copy @std + DEPENDS="python pygtk python-xdg beautifulsoup gnome-python-desktop \ + dbus-python gnome-icon-theme" } -# Post install/remove commands for Tazpkg. -post_install() -{ +post_install() { chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache } -post_remove() -{ +post_remove() { chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache } diff -r a54030a5b01b -r 2f03cb67a994 sheerdns/receipt --- a/sheerdns/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/sheerdns/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,33 +1,31 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="sheerdns" VERSION="1.0.3" CATEGORY="network" -SHORT_DESC="master DNS server." +SHORT_DESC="Master DNS server" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://threading.2038bug.com/sheerdns/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://threading.2038bug.com/sheerdns/" WGET_URL="${WEB_SITE}$TARBALL" -CONFIG_FILES="/var/sheerdns" -# Rules to configure and make the package. -compile_rules() -{ - mv $PACKAGE $src 2> /dev/null +compile_rules() { + mv $PACKAGE $src 2>/dev/null cd $src for i in $( cd $stuff ; ls *.u); do [ -f done.$i ] && continue patch -p0 < $stuff/$i touch done.$i done - make + make || return 1 + + mkdir -p $install/usr/bin/ $install/var/sheerdns/ + cp -a $src/sheerdns $src/sheerdnshash $install/usr/bin } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin $fs/var/sheerdns - cp -a $src/sheerdns $src/sheerdnshash $fs/usr/bin +genpkg_rules() { + copy @std + CONFIG_FILES="/var/sheerdns/" } - diff -r a54030a5b01b -r 2f03cb67a994 simh/receipt --- a/simh/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/simh/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,28 +1,27 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="simh" VERSION="39-0" CATEGORY="misc" -SHORT_DESC="multi-system simulator." +SHORT_DESC="Multi-system simulator" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL" +WEB_SITE="http://simh.trailing-edge.com/" + TARBALL="${PACKAGE}v$VERSION.zip" -WEB_SITE="http://simh.trailing-edge.com/" WGET_URL="${WEB_SITE}sources/$TARBALL" -TAGS="emulator PDP VAX Interdata Honeywell altair nova" BUILD_DEPENDS="libpcap-dev" -# Rules to configure and make the package. -compile_rules() -{ +compile_rules() { mkdir BIN - make -j 1 + make -j1 || return 1 + + mkdir -p $install/usr/bin/ + cp -a $src/BIN/* $install/usr/bin/ } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/bin - cp -a $src/BIN/* $fs/usr/bin +genpkg_rules() { + copy @std + TAGS="emulator PDP VAX Interdata Honeywell altair nova" } diff -r a54030a5b01b -r 2f03cb67a994 slitaz-configs/receipt --- a/slitaz-configs/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/slitaz-configs/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -16,17 +16,12 @@ locale-ru locale-zh_CN gettext" SPLIT="slitaz-themes slitaz-configs-base" -# Rules to configure and make the package. -compile_rules() -{ - case "$ARCH" in - i?86) - # xcompmgr produces visual glitches on the screen - sed -i 's|xcompmgr|compton|' ob-menu/menu.xml.in - make DESTDIR=$DESTDIR menu - ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml - ;; - esac +compile_rules() { + # xcompmgr produces visual glitches on the screen + sed -i 's|xcompmgr|compton|' ob-menu/menu.xml.in + make DESTDIR=$DESTDIR menu + ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml + find /usr/share/locale -type f -name 'slitaz*' cp -a $src/rootfs/* $install @@ -74,15 +69,19 @@ chown -R root:root $install } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in slitaz-configs) # Special case for ARM since some (most) config files are in slitaz-arm repo. # i486/arm common configs are provided by slitaz-configs-base. case "$ARCH" in - i?86) + arm*) + copy \ + /usr/share/applications/ \ + /usr/share/slitaz/ + DEPENDS="slitaz-arm-configs ttf-dejavu slim" + ;; + *) copy \ /etc/skel/.gtkrc-2.0* \ /etc/skel/.icons/ \ @@ -106,12 +105,6 @@ DEPENDS="slitaz-configs-base xorg-libXcomposite \ xorg-libXdamage transset-df ttf-dejavu slim compton" ;; - arm) - copy \ - /usr/share/applications/ \ - /usr/share/slitaz/ - DEPENDS="slitaz-arm-configs ttf-dejavu slim" - ;; esac CAT="base-system|for GUI systems" diff -r a54030a5b01b -r 2f03cb67a994 slitaz-icons-faenza/receipt --- a/slitaz-icons-faenza/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/slitaz-icons-faenza/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -11,7 +11,6 @@ BUILD_DEPENDS="faenza-icon-theme make-slitaz-icons" SPLIT="slitaz-icons-faenza-dark" -# Rules to compile and make the package. compile_rules() { # light theme ------------ mksit.sh \ @@ -46,16 +45,14 @@ fi done - cp -f $f/16x16/apps/system-log-out.png $f/16x16/actions +# cp -f $f/16x16/apps/system-log-out.png $f/16x16/actions for d in 16x16/status 16x16/apps 48x48; do rm -r $f/$d; done cp -f $stuff/index.theme $f # Use 16x16 icon on 22x22 canvas: cp $stuff/avatar-default-dark.png $f/22x22/status/avatar-default.png } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { case $PACKAGE in slitaz-icons-faenza) copy SliTaz-Faenza/ diff -r a54030a5b01b -r 2f03cb67a994 slitaz-icons-hydroxygen/receipt --- a/slitaz-icons-hydroxygen/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/slitaz-icons-hydroxygen/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -10,16 +10,13 @@ BUILD_DEPENDS="hydroxygen-iconset make-slitaz-icons" -# Rules to compile and makethe package. compile_rules() { mksit.sh \ -f /usr/share/icons/hydroxygen \ - -t $fs/usr/share/icons/SliTaz-Hydroxygen \ + -t $install/usr/share/icons/SliTaz-Hydroxygen \ -opmax } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ +genpkg_rules() { copy @std } diff -r a54030a5b01b -r 2f03cb67a994 sozi/receipt --- a/sozi/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/sozi/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,27 +1,22 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="sozi" VERSION="12.09-27213249" CATEGORY="graphics" -SHORT_DESC="A small program that can play animated presentations." +SHORT_DESC="A small program that can play animated presentations" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" WEB_SITE="http://sozi.baierouge.fr/" + TARBALL="$PACKAGE-release-$VERSION.zip" WGET_URL="https://github.com/downloads/senshu/Sozi/$TARBALL" -DEPENDS="inkscape python pygtk python-lxml" -BUILD_DEPENDS="wget" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src +compile_rules() { + mkdir -p $install/usr/share/inkscape/extensions/ + cp -a $src/* $install/usr/share/inkscape/extensions/ } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/share/inkscape/extensions - cp -a $src/* $fs/usr/share/inkscape/extensions/ +genpkg_rules() { + copy @std + DEPENDS="inkscape python pygtk python-lxml" } diff -r a54030a5b01b -r 2f03cb67a994 sshttp/receipt --- a/sshttp/receipt Mon Mar 12 11:53:39 2018 +0100 +++ b/sshttp/receipt Tue Mar 13 02:04:32 2018 +0200 @@ -1,40 +1,40 @@ -# SliTaz package receipt. +# SliTaz package receipt v2. PACKAGE="sshttp" VERSION="0-35s2" CATEGORY="network" -SHORT_DESC="hiding a SSH server behind a HTTP server." +SHORT_DESC="Hiding a SSH server behind a HTTP server" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" +WEB_SITE="https://github.com/stealth/$PACKAGE" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="https://github.com/stealth/$PACKAGE" WGET_URL="$WEB_SITE/archive/$TARBALL" -TAGS="ssh" -BUILD_DEPENDS="wget libcap libcap-dev" -DEPENDS="libcap gcc-lib-base" +BUILD_DEPENDS="libcap-dev" -# Rules to configure and make the package. -compile_rules() -{ - make && cp README* $WOK/$PACKAGE/description.txt +compile_rules() { + make && + install -Dm 755 $src/sshttpd $install/usr/sbin/sshttpd } -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/sbin - cp -a $src/sshttpd $fs/usr/sbin +genpkg_rules() { + copy @std + DEPENDS="libcap gcc-lib-base" + TAGS="ssh" } -# Pre and post install commands for Tazpkg. -post_install() -{ - [ "$1" ] || zcat /proc/config.gz | grep -q ^CONFIG_NETFILTER_TPROXY= || cat <