wok-next rev 19693
Add: gcr, oniguruma; remove: nano-doc; up: apr, fribidi, jasper, libgphoto2, libmtp, libunique, libwebp, nano, pcre, apr, apr-util, aspell*, glib-networking, gnutls, gsettings-desktop-schemas, gtk+, gtk+3, gvfs*, libexif, libfm, libgnutls, libmng, libraw, libsoup, libtasn1, libusb, libwebp, lxmenu-data, menu-cache, mysql, newt, p11-kit, pcre, popt, postgresql, slang, which
line diff
1.1 --- a/apr-dbd-mysql/receipt Sat Apr 15 16:06:43 2017 +0300 1.2 +++ b/apr-dbd-mysql/receipt Fri Apr 21 14:48:05 2017 +0300 1.3 @@ -1,20 +1,18 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="apr-dbd-mysql" 1.7 -VERSION="1.5.2" 1.8 -CATEGORY="development" 1.9 -SHORT_DESC="APR Library Utilities MySQL DBD driver" 1.10 +VERSION="1.5.4" 1.11 +CATEGORY="libdevel" 1.12 +SHORT_DESC="APR Library Utilities (MySQL DBD driver)" 1.13 MAINTAINER="erjo@slitaz.org" 1.14 LICENSE="Apache" 1.15 -WEB_SITE="http://apr.apache.org" 1.16 +WEB_SITE="http://apr.apache.org/" 1.17 + 1.18 WANTED="apr-util" 1.19 - 1.20 -DEPENDS="apr-util libmysqlclient" 1.21 +DEPENDS="apr-util libcrypto libmysqlclient libssl zlib" 1.22 1.23 # Rules to gen a SliTaz package suitable for Tazpkg. 1.24 genpkg_rules() 1.25 { 1.26 - mkdir -p $fs/usr/lib/apr-util-1 1.27 - 1.28 - cp -a $install/usr/lib/apr-util-1/*mysql*.so $fs/usr/lib/apr-util-1 1.29 + cook_copy_files *mysql*.so 1.30 }
2.1 --- a/apr-dbd-odbc/receipt Sat Apr 15 16:06:43 2017 +0300 2.2 +++ b/apr-dbd-odbc/receipt Fri Apr 21 14:48:05 2017 +0300 2.3 @@ -1,21 +1,18 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="apr-dbd-odbc" 2.7 -VERSION="1.5.2" 2.8 -CATEGORY="development" 2.9 -SHORT_DESC="APR Library Utilities ODBC DBD driver" 2.10 +VERSION="1.5.4" 2.11 +CATEGORY="libdevel" 2.12 +SHORT_DESC="APR Library Utilities (ODBC DBD driver)" 2.13 MAINTAINER="erjo@slitaz.org" 2.14 LICENSE="Apache" 2.15 WEB_SITE="http://apr.apache.org" 2.16 + 2.17 WANTED="apr-util" 2.18 - 2.19 DEPENDS="apr-util libunixODBC" 2.20 2.21 # Rules to gen a SliTaz package suitable for Tazpkg. 2.22 genpkg_rules() 2.23 { 2.24 - mkdir -p $fs/usr/lib/apr-util-1 2.25 - 2.26 - cp -a $install/usr/lib/apr-util-1/*odbc*.so $fs/usr/lib/apr-util-1 2.27 + cook_copy_files *odbc*.so 2.28 } 2.29 -
3.1 --- a/apr-dbd-pgsql/receipt Sat Apr 15 16:06:43 2017 +0300 3.2 +++ b/apr-dbd-pgsql/receipt Fri Apr 21 14:48:05 2017 +0300 3.3 @@ -1,20 +1,18 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="apr-dbd-pgsql" 3.7 -VERSION="1.5.2" 3.8 +VERSION="1.5.4" 3.9 CATEGORY="development" 3.10 -SHORT_DESC="APR Library Utilities PostgreSQL DBD driver" 3.11 +SHORT_DESC="APR Library Utilities (PostgreSQL DBD driver)" 3.12 MAINTAINER="erjo@slitaz.org" 3.13 LICENSE="Apache" 3.14 WEB_SITE="http://apr.apache.org" 3.15 + 3.16 WANTED="apr-util" 3.17 - 3.18 DEPENDS="apr-util libpostgresqlclient" 3.19 3.20 # Rules to gen a SliTaz package suitable for Tazpkg. 3.21 genpkg_rules() 3.22 { 3.23 - mkdir -p $fs/usr/lib/apr-util-1 3.24 - 3.25 - cp -a $install/usr/lib/apr-util-1/*pgsql*.so $fs/usr/lib/apr-util-1 3.26 + cook_copy_files *pgsql*.so 3.27 }
4.1 --- a/apr-dbd-sqlite/receipt Sat Apr 15 16:06:43 2017 +0300 4.2 +++ b/apr-dbd-sqlite/receipt Fri Apr 21 14:48:05 2017 +0300 4.3 @@ -1,21 +1,18 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="apr-dbd-sqlite" 4.7 -VERSION="1.5.2" 4.8 -CATEGORY="development" 4.9 -SHORT_DESC="Apache Portable Runtime Library Utilities SQLite DBD driver" 4.10 +VERSION="1.5.4" 4.11 +CATEGORY="libdevel" 4.12 +SHORT_DESC="APRuntime Library Utilities (SQLite DBD driver)" 4.13 MAINTAINER="erjo@slitaz.org" 4.14 LICENSE="Apache" 4.15 WEB_SITE="http://apr.apache.org" 4.16 + 4.17 WANTED="apr-util" 4.18 - 4.19 -DEPENDS="apr-util sqlite" 4.20 +DEPENDS="apr-util libsqlite" 4.21 4.22 # Rules to gen a SliTaz package suitable for Tazpkg. 4.23 genpkg_rules() 4.24 { 4.25 - mkdir -p $fs/usr/lib/apr-util-1 4.26 - 4.27 - cp -a $install/usr/lib/apr-util-1/*sqlite*.so $fs/usr/lib/apr-util-1 4.28 + cook_copy_files *sqlite*.so 4.29 } 4.30 -
5.1 --- a/apr-dev/receipt Sat Apr 15 16:06:43 2017 +0300 5.2 +++ b/apr-dev/receipt Fri Apr 21 14:48:05 2017 +0300 5.3 @@ -1,25 +1,19 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="apr-dev" 5.7 -VERSION="1.4.6" 5.8 +VERSION="1.5.2" 5.9 CATEGORY="development" 5.10 -SHORT_DESC="Apache Portable Runtime Library dev files" 5.11 +SHORT_DESC="Apache Portable Runtime Library (development files)" 5.12 MAINTAINER="lehswe@gmail.com" 5.13 LICENSE="Apache" 5.14 +WEB_SITE="http://apr.apache.org/" 5.15 + 5.16 WANTED="apr" 5.17 -WEB_SITE="http://apr.apache.org" 5.18 - 5.19 -DEPENDS="apr bash pkg-config" 5.20 +DEPENDS="apr glibc-dev util-linux-uuid-dev" 5.21 5.22 # Rules to gen a SliTaz package suitable for Tazpkg. 5.23 genpkg_rules() 5.24 { 5.25 - mkdir -p $fs/usr/lib $fs/usr/share 5.26 - 5.27 - cp -a $install/usr/bin $fs/usr 5.28 - cp -a $install/usr/include $fs/usr 5.29 - cp -a $install/usr/lib/*.*a $fs/usr/lib 5.30 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 5.31 - cp -a $install/usr/share/apr-1 $fs/usr/share 5.32 + cook_copy_folders bin apr-1 5.33 + cook_copy_files *.h *.la *.pc 5.34 } 5.35 -
6.1 --- a/apr-util-dev/receipt Sat Apr 15 16:06:43 2017 +0300 6.2 +++ b/apr-util-dev/receipt Fri Apr 21 14:48:05 2017 +0300 6.3 @@ -1,24 +1,18 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="apr-util-dev" 6.7 -VERSION="1.5.2" 6.8 +VERSION="1.5.4" 6.9 CATEGORY="development" 6.10 -SHORT_DESC="APR Library Utilities" 6.11 +SHORT_DESC="APR Library Utilities (development files)" 6.12 MAINTAINER="lehswe@gmail.com" 6.13 LICENSE="Apache" 6.14 -WANTED="apr-util" 6.15 WEB_SITE="http://apr.apache.org" 6.16 6.17 -DEPENDS="apr-util pkg-config" 6.18 +WANTED="apr-util" 6.19 +DEPENDS="apr-util apr-dbd-mysql apr-dbd-odbc apr-dbd-pgsql apr-dbd-sqlite" 6.20 6.21 # Rules to gen a SliTaz package suitable for Tazpkg. 6.22 genpkg_rules() 6.23 { 6.24 - mkdir -p $fs/usr/lib/apr-util-1 6.25 - cp -a $install/usr/include $fs/usr 6.26 - cp -a $install/usr/bin $fs/usr 6.27 - cp -a $install/usr/lib/*.*a $fs/usr/lib 6.28 - cp -a $install/usr/lib/apr-util-1/*.*a $fs/usr/lib/apr-util-1 6.29 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 6.30 + cook_copy_files apu-1-config *.h *.la *.pc 6.31 } 6.32 -
7.1 --- a/apr-util/receipt Sat Apr 15 16:06:43 2017 +0300 7.2 +++ b/apr-util/receipt Fri Apr 21 14:48:05 2017 +0300 7.3 @@ -1,38 +1,38 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="apr-util" 7.7 -VERSION="1.5.2" 7.8 +VERSION="1.5.4" 7.9 CATEGORY="development" 7.10 SHORT_DESC="APR Library Utilities" 7.11 MAINTAINER="lehswe@gmail.com" 7.12 LICENSE="Apache" 7.13 +WEB_SITE="http://apr.apache.org/" 7.14 + 7.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.16 -WEB_SITE="http://apr.apache.org" 7.17 -WGET_URL="http://www.apache.org/dist/apr/$TARBALL" 7.18 -#WGET_URL="http://apache.crihan.fr/dist/apr/$TARBALL" 7.19 +WGET_URL="http://archive.apache.org/dist/apr/$TARBALL" 7.20 7.21 DEPENDS="apr expat ncurses readline zlib" 7.22 -BUILD_DEPENDS="apr-dev unixODBC-dev sqlite-dev postgresql-dev mysql-dev libmysqlclient libpostgresqlclient util-linux-uuid-dev gawk" 7.23 - 7.24 +BUILD_DEPENDS="apr-dev openssl-dev gdbm-dev postgresql-dev sqlite-dev \ 7.25 +unixODBC-dev expat-dev mysql-dev" 7.26 +SPLIT="apr-dbd-mysql apr-dbd-odbc apr-dbd-pgsql apr-dbd-sqlite apr-util-dev" 7.27 + 7.28 # Rules to configure and make the package. 7.29 compile_rules() 7.30 { 7.31 - cd $src 7.32 - ./configure --with-apr=$(apr-1-config --bindir) \ 7.33 - --with-pgsql=/usr \ 7.34 + ./configure \ 7.35 + --prefix=/usr \ 7.36 + --with-apr=/usr \ 7.37 + --with-gdbm=/usr \ 7.38 + --with-openssl=/usr \ 7.39 --with-mysql \ 7.40 - --prefix=/usr \ 7.41 - --infodir=/usr/share/info \ 7.42 - --mandir=/usr/share/man $CONFIGURE_ARGS && 7.43 + --with-crypto \ 7.44 + $CONFIGURE_ARGS && 7.45 make && 7.46 - make DESTDIR=$DESTDIR install 7.47 + make install 7.48 } 7.49 7.50 # Rules to gen a SliTaz package suitable for Tazpkg. 7.51 genpkg_rules() 7.52 { 7.53 - mkdir -p $fs/usr/lib/apr-util-1 7.54 - 7.55 - cp -a $install/usr/lib/*.so* $fs/usr/lib 7.56 - #cp -a $install/usr/lib/apr-util-1/*.so* $fs/usr/lib/apr-util-1 7.57 + cook_copy_files libaprutil-1.so* aprutil.exp 7.58 }
8.1 --- a/apr/receipt Sat Apr 15 16:06:43 2017 +0300 8.2 +++ b/apr/receipt Fri Apr 21 14:48:05 2017 +0300 8.3 @@ -1,39 +1,38 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="apr" 8.7 -VERSION="1.4.6" 8.8 +VERSION="1.5.2" 8.9 CATEGORY="misc" 8.10 SHORT_DESC="Apache Portable Runtime Library" 8.11 MAINTAINER="lehswe@gmail.com" 8.12 LICENSE="Apache" 8.13 -TARBALL="$PACKAGE-$VERSION.tar.gz" 8.14 -WEB_SITE="http://apr.apache.org" 8.15 -WGET_URL="http://mir2.ovh.net/ftp.apache.org/dist/$PACKAGE/$TARBALL 8.16 - http://apache.crihan.fr/dist/$PACKAGE/$TARBALL" 8.17 +WEB_SITE="http://apr.apache.org/" 8.18 CROSS="error: cannot check for file existence when cross compiling" 8.19 8.20 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 8.21 +WGET_URL="http://archive.apache.org/dist/apr/$TARBALL" 8.22 + 8.23 DEPENDS="util-linux-uuid" 8.24 BUILD_DEPENDS="util-linux-uuid-dev" 8.25 8.26 # Rules to configure and make the package. 8.27 compile_rules() 8.28 { 8.29 - cd $src 8.30 + while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series 8.31 + 8.32 ./configure \ 8.33 --prefix=/usr \ 8.34 + --disable-static \ 8.35 --with-installbuilddir=/usr/share/apr-1/build \ 8.36 --enable-nonportable-atomics \ 8.37 --with-devrandom \ 8.38 --build=$HOST_SYSTEM \ 8.39 - --host=$HOST_SYSTEM 2>&1 | grep -v '/libtool:' && 8.40 + --host=$HOST_SYSTEM && 8.41 make && make install 8.42 } 8.43 8.44 # Rules to gen a SliTaz package suitable for Tazpkg. 8.45 genpkg_rules() 8.46 { 8.47 - mkdir -p $fs/usr/lib 8.48 - cp -a $install/usr/lib/*.so* $fs/usr/lib 8.49 - cp -a $install/usr/lib/*.exp $fs/usr/lib 8.50 + cook_copy_files *.so* *.exp 8.51 } 8.52 -
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/apr/stuff/patches/apr-fix-configure.patch Fri Apr 21 14:48:05 2017 +0300 9.3 @@ -0,0 +1,38 @@ 9.4 +--- a/configure 9.5 ++++ b/configure 9.6 +@@ -14744,7 +14744,7 @@ 9.7 + $RM out/* && rmdir out 9.8 + cd .. 9.9 + $RM -r conftest 9.10 +- $RM conftest* 9.11 ++ $RM conftest* 2>/dev/null 9.12 + 9.13 + fi 9.14 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 9.15 +@@ -16030,7 +16030,7 @@ 9.16 + if ${lt_cv_archive_cmds_need_lc+:} false; then : 9.17 + $as_echo_n "(cached) " >&6 9.18 + else 9.19 +- $RM conftest* 9.20 ++ $RM conftest* 2>/dev/null 9.21 + echo "$lt_simple_compile_test_code" > conftest.$ac_ext 9.22 + 9.23 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 9.24 +@@ -17744,7 +17744,7 @@ 9.25 + 9.26 + 9.27 + # get libtool's setting of shlibpath_var 9.28 +- eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool` 9.29 ++ eval `grep "^shlibpath_var=[A-Z_]*$" $apr_builddir/libtool 2>/dev/null` 9.30 + if test "x$shlibpath_var" = "x"; then 9.31 + shlibpath_var=REPLACE_WITH_YOUR_SHLIBPATH_VAR 9.32 + fi 9.33 +@@ -30203,7 +30203,7 @@ 9.34 + 9.35 + cfgfile="${ofile}T" 9.36 + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 9.37 +- $RM "$cfgfile" 9.38 ++ $RM "$cfgfile" 2>/dev/null 9.39 + 9.40 + cat <<_LT_EOF >> "$cfgfile" 9.41 + #! $SHELL
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/apr/stuff/patches/series Fri Apr 21 14:48:05 2017 +0300 10.3 @@ -0,0 +1,1 @@ 10.4 +apr-fix-configure.patch
11.1 --- a/aspell-cs/receipt Sat Apr 15 16:06:43 2017 +0300 11.2 +++ b/aspell-cs/receipt Fri Apr 21 14:48:05 2017 +0300 11.3 @@ -2,30 +2,26 @@ 11.4 11.5 PACKAGE="aspell-cs" 11.6 VERSION="20040614-1" 11.7 -CATEGORY="system-tools" 11.8 +CATEGORY="text" 11.9 SHORT_DESC="Czech aspell dictionary." 11.10 MAINTAINER="erjo@slitaz.org" 11.11 LICENSE="GPL2" 11.12 -SOURCE="aspell6-cs" 11.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 11.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 11.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/cs/$TARBALL" 11.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 11.17 + 11.18 +TARBALL="aspell6-cs-$VERSION.tar.bz2" 11.19 +WGET_URL="$GNU_MIRROR/aspell/dict/cs/$TARBALL" 11.20 11.21 DEPENDS="aspell" 11.22 -BUILD_DEPENDS="aspell aspell-dev" 11.23 +BUILD_DEPENDS="aspell-dev" 11.24 11.25 # Rules to configure and make the package. 11.26 compile_rules() 11.27 { 11.28 - cd $src 11.29 - ./configure && \ 11.30 - make && make DESTDIR=$DESTDIR install 11.31 + ./configure && make && make install 11.32 } 11.33 11.34 # Rules to gen a SliTaz package suitable for Tazpkg. 11.35 genpkg_rules() 11.36 { 11.37 - mkdir -p $fs/usr/lib 11.38 - cp -a $install/usr/lib/* $fs/usr/lib 11.39 + cook_copy_folders lib 11.40 } 11.41 -
12.1 --- a/aspell-da/receipt Sat Apr 15 16:06:43 2017 +0300 12.2 +++ b/aspell-da/receipt Fri Apr 21 14:48:05 2017 +0300 12.3 @@ -2,30 +2,26 @@ 12.4 12.5 PACKAGE="aspell-da" 12.6 VERSION="1.4.42-1" 12.7 -CATEGORY="system-tools" 12.8 +CATEGORY="text" 12.9 SHORT_DESC="Danish aspell dictionary." 12.10 MAINTAINER="paul@slitaz.org" 12.11 LICENSE="GPL2" 12.12 -SOURCE="aspell5-da" 12.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 12.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 12.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/da/$TARBALL" 12.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 12.17 + 12.18 +TARBALL="aspell5-da-$VERSION.tar.bz2" 12.19 +WGET_URL="$GNU_MIRROR/aspell/dict/da/$TARBALL" 12.20 12.21 DEPENDS="aspell" 12.22 -BUILD_DEPENDS="aspell aspell-dev" 12.23 +BUILD_DEPENDS="aspell-dev" 12.24 12.25 # Rules to configure and make the package. 12.26 compile_rules() 12.27 { 12.28 - cd $src 12.29 - ./configure && \ 12.30 - make && make DESTDIR=$DESTDIR install 12.31 + ./configure && make && make install 12.32 } 12.33 12.34 # Rules to gen a SliTaz package suitable for Tazpkg. 12.35 genpkg_rules() 12.36 { 12.37 - mkdir -p $fs/usr/lib 12.38 - cp -a $install/usr/lib/* $fs/usr/lib 12.39 + cook_copy_folders lib 12.40 } 12.41 -
13.1 --- a/aspell-de/receipt Sat Apr 15 16:06:43 2017 +0300 13.2 +++ b/aspell-de/receipt Fri Apr 21 14:48:05 2017 +0300 13.3 @@ -2,29 +2,26 @@ 13.4 13.5 PACKAGE="aspell-de" 13.6 VERSION="20030222-1" 13.7 -CATEGORY="system-tools" 13.8 +CATEGORY="text" 13.9 SHORT_DESC="German aspell dictionary." 13.10 MAINTAINER="paul@slitaz.org" 13.11 LICENSE="GPL2" 13.12 -SOURCE="aspell6-de" 13.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 13.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 13.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/de/$TARBALL" 13.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 13.17 + 13.18 +TARBALL="aspell6-de-$VERSION.tar.bz2" 13.19 +WGET_URL="$GNU_MIRROR/aspell/dict/de/$TARBALL" 13.20 13.21 DEPENDS="aspell" 13.22 -BUILD_DEPENDS="aspell aspell-dev" 13.23 +BUILD_DEPENDS="aspell-dev" 13.24 13.25 # Rules to configure and make the package. 13.26 compile_rules() 13.27 { 13.28 - cd $src 13.29 - ./configure && \ 13.30 - make && make DESTDIR=$DESTDIR install 13.31 + ./configure && make && make install 13.32 } 13.33 13.34 # Rules to gen a SliTaz package suitable for Tazpkg. 13.35 genpkg_rules() 13.36 { 13.37 - mkdir -p $fs/usr/lib 13.38 - cp -a $install/usr/lib/* $fs/usr/lib 13.39 + cook_copy_folders lib 13.40 }
14.1 --- a/aspell-dev/receipt Sat Apr 15 16:06:43 2017 +0300 14.2 +++ b/aspell-dev/receipt Fri Apr 21 14:48:05 2017 +0300 14.3 @@ -1,21 +1,18 @@ 14.4 # SliTaz package receipt. 14.5 14.6 PACKAGE="aspell-dev" 14.7 -VERSION="0.60.6" 14.8 +VERSION="0.60.6.1" 14.9 CATEGORY="development" 14.10 -SHORT_DESC="GNU spell checker devel files." 14.11 +SHORT_DESC="GNU spell checker (development files)" 14.12 MAINTAINER="paul@slitaz.org" 14.13 LICENSE="LGPL2" 14.14 WEB_SITE="http://aspell.net/" 14.15 +HOST_ARCH="i486 arm" 14.16 + 14.17 WANTED="aspell" 14.18 -HOST_ARCH="i486 arm" 14.19 14.20 # Rules to gen a SliTaz package suitable for Tazpkg. 14.21 genpkg_rules() 14.22 { 14.23 - # Hard coded 14.24 - mkdir -p $fs/usr/lib/aspell-0.60 14.25 - cp -a $install/usr/lib/*.*a $fs/usr/lib 14.26 - cp -a $install/usr/include $fs/usr 14.27 - cp -a $install/usr/lib/aspell*/*.*a $fs/usr/lib/aspell-0.60 14.28 + cook_copy_files *.h *.la pspell-config 14.29 }
15.1 --- a/aspell-en/receipt Sat Apr 15 16:06:43 2017 +0300 15.2 +++ b/aspell-en/receipt Fri Apr 21 14:48:05 2017 +0300 15.3 @@ -1,30 +1,28 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="aspell-en" 15.7 -VERSION="7.1-0" 15.8 -CATEGORY="system-tools" 15.9 +VERSION="2017.01.22-0" 15.10 +CATEGORY="text" 15.11 SHORT_DESC="English aspell dictionary." 15.12 MAINTAINER="paul@slitaz.org" 15.13 LICENSE="PublicDomain" 15.14 -SOURCE="aspell6-en" 15.15 -TARBALL="$SOURCE-$VERSION.tar.bz2" 15.16 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 15.17 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/en/$TARBALL" 15.18 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 15.19 HOST_ARCH="i486 arm" 15.20 15.21 +TARBALL="aspell6-en-$VERSION.tar.bz2" 15.22 +WGET_URL="$GNU_MIRROR/aspell/dict/en/$TARBALL" 15.23 + 15.24 DEPENDS="aspell" 15.25 BUILD_DEPENDS="aspell-dev" 15.26 15.27 # Rules to configure and make the package. 15.28 compile_rules() 15.29 { 15.30 - ./configure && 15.31 - make && make install 15.32 + ./configure && make && make install 15.33 } 15.34 15.35 # Rules to gen a SliTaz package suitable for Tazpkg. 15.36 genpkg_rules() 15.37 { 15.38 - mkdir -p $fs/usr/lib 15.39 - cp -a $install/usr/lib/* $fs/usr/lib 15.40 + cook_copy_folders lib 15.41 }
16.1 --- a/aspell-es/receipt Sat Apr 15 16:06:43 2017 +0300 16.2 +++ b/aspell-es/receipt Fri Apr 21 14:48:05 2017 +0300 16.3 @@ -1,30 +1,28 @@ 16.4 # SliTaz package receipt. 16.5 16.6 PACKAGE="aspell-es" 16.7 -VERSION="1.11" 16.8 -CATEGORY="system-tools" 16.9 +VERSION="1.11-2" 16.10 +CATEGORY="text" 16.11 SHORT_DESC="Spanish aspell dictionary." 16.12 MAINTAINER="paul@slitaz.org" 16.13 LICENSE="GPL2" 16.14 -SOURCE="aspell6-es" 16.15 -TARBALL="$SOURCE-$VERSION-2.tar.bz2" 16.16 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 16.17 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/es/$TARBALL" 16.18 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 16.19 HOST_ARCH="i486 arm" 16.20 16.21 +TARBALL="aspell6-es-$VERSION.tar.bz2" 16.22 +WGET_URL="$GNU_MIRROR/aspell/dict/es/$TARBALL" 16.23 + 16.24 DEPENDS="aspell" 16.25 BUILD_DEPENDS="aspell-dev" 16.26 16.27 # Rules to configure and make the package. 16.28 compile_rules() 16.29 { 16.30 - ./configure && 16.31 - make && make install 16.32 + ./configure && make && make install 16.33 } 16.34 16.35 # Rules to gen a SliTaz package suitable for Tazpkg. 16.36 genpkg_rules() 16.37 { 16.38 - mkdir -p $fs/usr/lib 16.39 - cp -a $install/usr/lib/* $fs/usr/lib 16.40 + cook_copy_folders lib 16.41 }
17.1 --- a/aspell-fr/receipt Sat Apr 15 16:06:43 2017 +0300 17.2 +++ b/aspell-fr/receipt Fri Apr 21 14:48:05 2017 +0300 17.3 @@ -2,14 +2,15 @@ 17.4 17.5 PACKAGE="aspell-fr" 17.6 VERSION="0.50-3" 17.7 -CATEGORY="system-tools" 17.8 +CATEGORY="text" 17.9 SHORT_DESC="French aspell dictionary." 17.10 MAINTAINER="paul@slitaz.org" 17.11 LICENSE="GPL2" 17.12 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 17.13 +HOST_ARCH="i486 arm" 17.14 + 17.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 17.16 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 17.17 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/fr/$TARBALL" 17.18 -HOST_ARCH="i486 arm" 17.19 +WGET_URL="$GNU_MIRROR/aspell/dict/fr/$TARBALL" 17.20 17.21 DEPENDS="aspell" 17.22 BUILD_DEPENDS="aspell-dev" 17.23 @@ -17,13 +18,11 @@ 17.24 # Rules to configure and make the package. 17.25 compile_rules() 17.26 { 17.27 - ./configure && 17.28 - make && make install 17.29 + ./configure && make && make install 17.30 } 17.31 17.32 # Rules to gen a SliTaz package suitable for Tazpkg. 17.33 genpkg_rules() 17.34 { 17.35 - mkdir -p $fs/usr/lib 17.36 - cp -a $install/usr/lib/* $fs/usr/lib 17.37 + cook_copy_folders lib 17.38 }
18.1 --- a/aspell-hu/receipt Sat Apr 15 16:06:43 2017 +0300 18.2 +++ b/aspell-hu/receipt Fri Apr 21 14:48:05 2017 +0300 18.3 @@ -2,31 +2,26 @@ 18.4 18.5 PACKAGE="aspell-hu" 18.6 VERSION="0.99.4.2-0" 18.7 -CATEGORY="system-tools" 18.8 +CATEGORY="text" 18.9 SHORT_DESC="Hungarian aspell dictionary." 18.10 MAINTAINER="erjo@slitaz.org" 18.11 LICENSE="GPL2" 18.12 -SOURCE="aspell6-hu" 18.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 18.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 18.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/hu/$TARBALL" 18.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 18.17 + 18.18 +TARBALL="aspell6-hu-$VERSION.tar.bz2" 18.19 +WGET_URL="$GNU_MIRROR/aspell/dict/hu/$TARBALL" 18.20 18.21 DEPENDS="aspell" 18.22 -BUILD_DEPENDS="aspell aspell-dev" 18.23 +BUILD_DEPENDS="aspell-dev" 18.24 18.25 # Rules to configure and make the package. 18.26 compile_rules() 18.27 { 18.28 - cd $src 18.29 - ./configure && \ 18.30 - make && make DESTDIR=$DESTDIR install 18.31 + ./configure && make && make install 18.32 } 18.33 18.34 # Rules to gen a SliTaz package suitable for Tazpkg. 18.35 genpkg_rules() 18.36 { 18.37 - mkdir -p $fs/usr/lib 18.38 - cp -a $install/usr/lib/* $fs/usr/lib 18.39 + cook_copy_folders lib 18.40 } 18.41 - 18.42 -
19.1 --- a/aspell-id/receipt Sat Apr 15 16:06:43 2017 +0300 19.2 +++ b/aspell-id/receipt Fri Apr 21 14:48:05 2017 +0300 19.3 @@ -2,31 +2,26 @@ 19.4 19.5 PACKAGE="aspell-id" 19.6 VERSION="1.2-0" 19.7 -CATEGORY="system-tools" 19.8 +CATEGORY="text" 19.9 SHORT_DESC="Indonesian aspell dictionary." 19.10 MAINTAINER="erjo@slitaz.org" 19.11 LICENSE="GPL2" 19.12 -SOURCE="aspell5-id" 19.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 19.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 19.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/id/$TARBALL" 19.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 19.17 + 19.18 +TARBALL="aspell5-id-$VERSION.tar.bz2" 19.19 +WGET_URL="$GNU_MIRROR/aspell/dict/id/$TARBALL" 19.20 19.21 DEPENDS="aspell" 19.22 -BUILD_DEPENDS="aspell aspell-dev" 19.23 +BUILD_DEPENDS="aspell-dev" 19.24 19.25 # Rules to configure and make the package. 19.26 compile_rules() 19.27 { 19.28 - cd $src 19.29 - ./configure && \ 19.30 - make && make DESTDIR=$DESTDIR install 19.31 + ./configure && make && make install 19.32 } 19.33 19.34 # Rules to gen a SliTaz package suitable for Tazpkg. 19.35 genpkg_rules() 19.36 { 19.37 - mkdir -p $fs/usr/lib 19.38 - cp -a $install/usr/lib/* $fs/usr/lib 19.39 + cook_copy_folders lib 19.40 } 19.41 - 19.42 -
20.1 --- a/aspell-it/receipt Sat Apr 15 16:06:43 2017 +0300 20.2 +++ b/aspell-it/receipt Fri Apr 21 14:48:05 2017 +0300 20.3 @@ -2,30 +2,26 @@ 20.4 20.5 PACKAGE="aspell-it" 20.6 VERSION="2.2_20050523-0" 20.7 -CATEGORY="system-tools" 20.8 +CATEGORY="text" 20.9 SHORT_DESC="Italian aspell dictionary." 20.10 MAINTAINER="erjo@slitaz.org" 20.11 LICENSE="GPL2" 20.12 -SOURCE="aspell6-it" 20.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 20.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 20.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/it/$TARBALL" 20.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 20.17 + 20.18 +TARBALL="aspell6-it-$VERSION.tar.bz2" 20.19 +WGET_URL="$GNU_MIRROR/aspell/dict/it/$TARBALL" 20.20 20.21 DEPENDS="aspell" 20.22 -BUILD_DEPENDS="aspell aspell-dev" 20.23 +BUILD_DEPENDS="aspell-dev" 20.24 20.25 # Rules to configure and make the package. 20.26 compile_rules() 20.27 { 20.28 - cd $src 20.29 - ./configure && \ 20.30 - make && make DESTDIR=$DESTDIR install 20.31 + ./configure && make && make install 20.32 } 20.33 20.34 # Rules to gen a SliTaz package suitable for Tazpkg. 20.35 genpkg_rules() 20.36 { 20.37 - mkdir -p $fs/usr/lib 20.38 - cp -a $install/usr/lib/* $fs/usr/lib 20.39 + cook_copy_folders lib 20.40 } 20.41 -
21.1 --- a/aspell-nl/receipt Sat Apr 15 16:06:43 2017 +0300 21.2 +++ b/aspell-nl/receipt Fri Apr 21 14:48:05 2017 +0300 21.3 @@ -2,29 +2,26 @@ 21.4 21.5 PACKAGE="aspell-nl" 21.6 VERSION="0.50-2" 21.7 -CATEGORY="system-tools" 21.8 +CATEGORY="text" 21.9 SHORT_DESC="Dutch aspell dictionary." 21.10 MAINTAINER="paul@slitaz.org" 21.11 LICENSE="GPL" 21.12 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 21.13 + 21.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 21.15 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 21.16 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/nl/$TARBALL" 21.17 +WGET_URL="$GNU_MIRROR/aspell/dict/nl/$TARBALL" 21.18 21.19 DEPENDS="aspell" 21.20 -BUILD_DEPENDS="aspell aspell-dev" 21.21 +BUILD_DEPENDS="aspell-dev" 21.22 21.23 # Rules to configure and make the package. 21.24 compile_rules() 21.25 { 21.26 - cd $src 21.27 - ./configure && \ 21.28 - make && make DESTDIR=$DESTDIR install 21.29 + ./configure && make && make install 21.30 } 21.31 21.32 # Rules to gen a SliTaz package suitable for Tazpkg. 21.33 genpkg_rules() 21.34 { 21.35 - mkdir -p $fs/usr 21.36 - cp -a $install/usr/lib $fs/usr 21.37 + cook_copy_folders lib 21.38 } 21.39 -
22.1 --- a/aspell-pl/receipt Sat Apr 15 16:06:43 2017 +0300 22.2 +++ b/aspell-pl/receipt Fri Apr 21 14:48:05 2017 +0300 22.3 @@ -6,26 +6,22 @@ 22.4 SHORT_DESC="Polish aspell dictionary." 22.5 MAINTAINER="paul@slitaz.org" 22.6 LICENSE="GPL LGPL CC-SA" 22.7 -SOURCE="aspell6-pl" 22.8 -TARBALL="$SOURCE-$VERSION.tar.bz2" 22.9 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 22.10 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/pl/$TARBALL" 22.11 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 22.12 + 22.13 +TARBALL="aspell6-pl-$VERSION.tar.bz2" 22.14 +WGET_URL="$GNU_MIRROR/aspell/dict/pl/$TARBALL" 22.15 22.16 DEPENDS="aspell" 22.17 -BUILD_DEPENDS="aspell aspell-dev" 22.18 +BUILD_DEPENDS="aspell-dev" 22.19 22.20 # Rules to configure and make the package. 22.21 compile_rules() 22.22 { 22.23 - cd $src 22.24 - ./configure && \ 22.25 - make && make DESTDIR=$DESTDIR install 22.26 + ./configure && make && make install 22.27 } 22.28 22.29 # Rules to gen a SliTaz package suitable for Tazpkg. 22.30 genpkg_rules() 22.31 { 22.32 - mkdir -p $fs/usr 22.33 - cp -a $install/usr/lib $fs/usr 22.34 + cook_copy_folders lib 22.35 } 22.36 -
23.1 --- a/aspell-pt_BR/receipt Sat Apr 15 16:06:43 2017 +0300 23.2 +++ b/aspell-pt_BR/receipt Fri Apr 21 14:48:05 2017 +0300 23.3 @@ -1,30 +1,28 @@ 23.4 # SliTaz package receipt. 23.5 23.6 PACKAGE="aspell-pt_BR" 23.7 -VERSION="20080707-0" 23.8 +VERSION="20090702-0" 23.9 CATEGORY="system-tools" 23.10 SHORT_DESC="Brazilian aspell dictionary." 23.11 MAINTAINER="paul@slitaz.org" 23.12 LICENSE="LGPL2.1" 23.13 -SOURCE="aspell6-pt_BR" 23.14 -TARBALL="$SOURCE-$VERSION.tar.bz2" 23.15 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 23.16 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/$TARBALL" 23.17 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 23.18 HOST_ARCH="i486 arm" 23.19 23.20 +TARBALL="aspell6-pt_BR-$VERSION.tar.bz2" 23.21 +WGET_URL="$GNU_MIRROR/aspell/dict/pt_BR/$TARBALL" 23.22 + 23.23 DEPENDS="aspell" 23.24 BUILD_DEPENDS="aspell-dev" 23.25 23.26 # Rules to configure and make the package. 23.27 compile_rules() 23.28 { 23.29 - ./configure && 23.30 - make && make install 23.31 + ./configure && make && make install 23.32 } 23.33 23.34 # Rules to gen a SliTaz package suitable for Tazpkg. 23.35 genpkg_rules() 23.36 { 23.37 - mkdir -p $fs/usr/lib 23.38 - cp -a $install/usr/lib/* $fs/usr/lib 23.39 + cook_copy_folders lib 23.40 }
24.1 --- a/aspell-pt_PT/receipt Sat Apr 15 16:06:43 2017 +0300 24.2 +++ b/aspell-pt_PT/receipt Fri Apr 21 14:48:05 2017 +0300 24.3 @@ -2,29 +2,26 @@ 24.4 24.5 PACKAGE="aspell-pt_PT" 24.6 VERSION="20070510-0" 24.7 -CATEGORY="system-tools" 24.8 +CATEGORY="text" 24.9 SHORT_DESC="Portuguese aspell dictionary." 24.10 MAINTAINER="paul@slitaz.org" 24.11 LICENSE="GPL2" 24.12 -SOURCE="aspell6-pt_PT" 24.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 24.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 24.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/$TARBALL" 24.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 24.17 + 24.18 +TARBALL="aspell6-pt_PT-$VERSION.tar.bz2" 24.19 +WGET_URL="$GNU_MIRROR/aspell/dict/pt_PT/$TARBALL" 24.20 24.21 DEPENDS="aspell" 24.22 -BUILD_DEPENDS="aspell aspell-dev" 24.23 +BUILD_DEPENDS="aspell-dev" 24.24 24.25 # Rules to configure and make the package. 24.26 compile_rules() 24.27 { 24.28 - cd $src 24.29 - ./configure && \ 24.30 - make && make DESTDIR=$DESTDIR install 24.31 + ./configure && make && make install 24.32 } 24.33 24.34 # Rules to gen a SliTaz package suitable for Tazpkg. 24.35 genpkg_rules() 24.36 { 24.37 - mkdir -p $fs/usr/lib 24.38 - cp -a $install/usr/lib/* $fs/usr/lib 24.39 + cook_copy_folders lib 24.40 }
25.1 --- a/aspell-ru/receipt Sat Apr 15 16:06:43 2017 +0300 25.2 +++ b/aspell-ru/receipt Fri Apr 21 14:48:05 2017 +0300 25.3 @@ -2,29 +2,26 @@ 25.4 25.5 PACKAGE="aspell-ru" 25.6 VERSION="0.99f7-1" 25.7 -CATEGORY="system-tools" 25.8 +CATEGORY="text" 25.9 SHORT_DESC="Russian aspell dictionary." 25.10 MAINTAINER="erjo@slitaz.org" 25.11 LICENSE="other" 25.12 -SOURCE="aspell6-ru" 25.13 -TARBALL="$SOURCE-$VERSION.tar.bz2" 25.14 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 25.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/ru/$TARBALL" 25.16 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 25.17 + 25.18 +TARBALL="aspell6-ru-$VERSION.tar.bz2" 25.19 +WGET_URL="$GNU_MIRROR/aspell/dict/ru/$TARBALL" 25.20 25.21 DEPENDS="aspell" 25.22 -BUILD_DEPENDS="aspell aspell-dev" 25.23 +BUILD_DEPENDS="aspell-dev" 25.24 25.25 # Rules to configure and make the package. 25.26 compile_rules() 25.27 { 25.28 - cd $src 25.29 - ./configure && \ 25.30 - make && make DESTDIR=$DESTDIR install 25.31 + ./configure && make && make install 25.32 } 25.33 25.34 # Rules to gen a SliTaz package suitable for Tazpkg. 25.35 genpkg_rules() 25.36 { 25.37 - mkdir -p $fs/usr/lib 25.38 - cp -a $install/usr/lib/* $fs/usr/lib 25.39 + cook_copy_folders lib 25.40 }
26.1 --- a/aspell-sl/receipt Sat Apr 15 16:06:43 2017 +0300 26.2 +++ b/aspell-sl/receipt Fri Apr 21 14:48:05 2017 +0300 26.3 @@ -2,28 +2,26 @@ 26.4 26.5 PACKAGE="aspell-sl" 26.6 VERSION="0.50-0" 26.7 -CATEGORY="system-tools" 26.8 +CATEGORY="text" 26.9 SHORT_DESC="Slovenian aspell dictionary." 26.10 MAINTAINER="erjo@slitaz.org" 26.11 LICENSE="GPL2" 26.12 +WEB_SITE="https://ftp.gnu.org/gnu/aspell/dict/0index.html" 26.13 + 26.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 26.15 -WEB_SITE="ftp://ftp.gnu.org/gnu/aspell/dict/0index.html" 26.16 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/dict/sl/$TARBALL" 26.17 +WGET_URL="$GNU_MIRROR/aspell/dict/sl/$TARBALL" 26.18 26.19 DEPENDS="aspell" 26.20 -BUILD_DEPENDS="aspell aspell-dev" 26.21 +BUILD_DEPENDS="aspell-dev" 26.22 26.23 # Rules to configure and make the package. 26.24 compile_rules() 26.25 { 26.26 - cd $src 26.27 - ./configure && \ 26.28 - make && make DESTDIR=$DESTDIR install 26.29 + ./configure && make && make install 26.30 } 26.31 26.32 # Rules to gen a SliTaz package suitable for Tazpkg. 26.33 genpkg_rules() 26.34 { 26.35 - mkdir -p $fs/usr/lib 26.36 - cp -a $install/usr/lib/* $fs/usr/lib 26.37 + cook_copy_folders lib 26.38 }
27.1 --- a/aspell/description.txt Sat Apr 15 16:06:43 2017 +0300 27.2 +++ b/aspell/description.txt Fri Apr 21 14:48:05 2017 +0300 27.3 @@ -1,4 +1,4 @@ 27.4 -GNU Aspell is a Free and Open Source spell checker. It can either be used as a 27.5 -library or as an independent spell checker. Its main feature is that it does a 27.6 -superior job of suggesting possible replacements for a misspelled word than just 27.7 -about any other spell checker out there for the English language. 27.8 +GNU Aspell is a Free and Open Source spell checker. It can either be used as a 27.9 +library or as an independent spell checker. Its main feature is that it does a 27.10 +superior job of suggesting possible replacements for a misspelled word than 27.11 +just about any other spell checker out there for the English language.
28.1 --- a/aspell/receipt Sat Apr 15 16:06:43 2017 +0300 28.2 +++ b/aspell/receipt Fri Apr 21 14:48:05 2017 +0300 28.3 @@ -1,35 +1,40 @@ 28.4 # SliTaz package receipt. 28.5 28.6 PACKAGE="aspell" 28.7 -VERSION="0.60.6" 28.8 +VERSION="0.60.6.1" 28.9 CATEGORY="system-tools" 28.10 SHORT_DESC="GNU spell checker." 28.11 MAINTAINER="paul@slitaz.org" 28.12 LICENSE="LGPL2" 28.13 WEB_SITE="http://aspell.net/" 28.14 -TARBALL="$PACKAGE-$VERSION.tar.gz" 28.15 -WGET_URL="ftp://ftp.gnu.org/gnu/aspell/$TARBALL" 28.16 TAGS="spell check" 28.17 HOST_ARCH="i486 arm" 28.18 28.19 -DEPENDS="ncursesw" 28.20 -BUILD_DEPENDS="ncursesw-dev libtinfo" 28.21 +TARBALL="$PACKAGE-$VERSION.tar.gz" 28.22 +WGET_URL="$GNU_MIRROR/aspell/$TARBALL" 28.23 + 28.24 +DEPENDS="ncurses" 28.25 +BUILD_DEPENDS="perl gettext ncurses-dev" 28.26 28.27 # Rules to configure and make the package. 28.28 compile_rules() 28.29 { 28.30 - export LDFLAGS="$LDFLAGS -ltinfo" 28.31 - ./configure $CONFIGURE_ARGS && \ 28.32 - make && make install 28.33 + ./configure $CONFIGURE_ARGS && make && make install 28.34 + 28.35 + install -v -m755 -d $install/usr/share/doc/aspell-$VERSION/aspell.html && 28.36 + install -v -m755 -d $install/usr/share/doc/aspell-$VERSION/aspell-dev.html && 28.37 + install -v -m644 manual/aspell.html/* \ 28.38 + $install/usr/share/doc/aspell-$VERSION/aspell.html && 28.39 + install -v -m644 manual/aspell-dev.html/* \ 28.40 + $install/usr/share/doc/aspell-$VERSION/aspell-dev.html 28.41 } 28.42 28.43 # Rules to gen a SliTaz package suitable for Tazpkg. 28.44 genpkg_rules() 28.45 { 28.46 - mkdir -p $fs/usr/lib 28.47 - cp -a $install/usr/bin $fs/usr 28.48 - cp -a $install/usr/lib/*.so* $fs/usr/lib 28.49 - cp -a $install/usr/lib/aspell* $fs/usr/lib 28.50 - # Remove unneeded files 28.51 - rm -f $fs/usr/lib/aspell*/*.*a 28.52 + cook_copy_folders bin 28.53 + find $fs -name '*-config' -delete 28.54 + cook_copy_files *.so* *.amf *filter.info *.cmap *.cset *.kbd *.amf spell ispell 28.55 + 28.56 + ln -svfn aspell-0.60 $fs/usr/lib/aspell 28.57 }
29.1 --- a/fribidi-dev/receipt Sat Apr 15 16:06:43 2017 +0300 29.2 +++ b/fribidi-dev/receipt Fri Apr 21 14:48:05 2017 +0300 29.3 @@ -1,23 +1,19 @@ 29.4 # SliTaz package receipt. 29.5 29.6 PACKAGE="fribidi-dev" 29.7 -VERSION="0.19.2" 29.8 +VERSION="0.19.7" 29.9 CATEGORY="development" 29.10 -SHORT_DESC="Devel files Unicode Bidirectional Algorithm" 29.11 +SHORT_DESC="Implementation of the Unicode Bidirectional Algorithm (development files)" 29.12 MAINTAINER="pankso@slitaz.org" 29.13 LICENSE="LGPL2.1" 29.14 -WANTED="fribidi" 29.15 -WEB_SITE="http://fribidi.freedesktop.org/wiki/" 29.16 +WEB_SITE="https://www.fribidi.org/" 29.17 HOST_ARCH="i486 arm" 29.18 29.19 -DEPENDS="fribidi pkg-config" 29.20 +WANTED="fribidi" 29.21 +DEPENDS="fribidi glib-dev glibc-dev pcre-dev" 29.22 29.23 # Rules to gen a SliTaz package suitable for Tazpkg. 29.24 genpkg_rules() 29.25 { 29.26 - mkdir -p $fs/usr/bin $fs/usr/lib 29.27 - cp -a $install/usr/lib/*.*a $fs/usr/lib 29.28 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 29.29 - cp -a $install/usr/include $fs/usr 29.30 + cook_copy_files *.h *.la *.pc 29.31 } 29.32 -
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/fribidi/description.txt Fri Apr 21 14:48:05 2017 +0300 30.3 @@ -0,0 +1,3 @@ 30.4 +GNU FriBidi is an implementation of the [Unicode Bidirectional Algorithm 30.5 +(BIDI)](http://www.unicode.org/reports/tr9/). This is useful for supporting 30.6 +Arabic and Hebrew alphabets in other packages.
31.1 --- a/fribidi/receipt Sat Apr 15 16:06:43 2017 +0300 31.2 +++ b/fribidi/receipt Fri Apr 21 14:48:05 2017 +0300 31.3 @@ -1,30 +1,28 @@ 31.4 # SliTaz package receipt. 31.5 31.6 PACKAGE="fribidi" 31.7 -VERSION="0.19.2" 31.8 +VERSION="0.19.7" 31.9 CATEGORY="x-window" 31.10 -SHORT_DESC="Free implementation of the Unicode Bidirectional Algorithm" 31.11 +SHORT_DESC="Implementation of the Unicode Bidirectional Algorithm" 31.12 MAINTAINER="pankso@slitaz.org" 31.13 LICENSE="LGPL2.1" 31.14 -TARBALL="$PACKAGE-$VERSION.tar.gz" 31.15 -WEB_SITE="http://fribidi.freedesktop.org/wiki/" 31.16 -WGET_URL="http://fribidi.org/download/$TARBALL" 31.17 +WEB_SITE="https://www.fribidi.org/" 31.18 HOST_ARCH="i486 arm" 31.19 31.20 -DEPENDS="glibc-base" 31.21 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 31.22 +WGET_URL="http://fribidi.org/download/$TARBALL" 31.23 + 31.24 +DEPENDS="glib pcre" 31.25 +BUILD_DEPENDS="glib-dev" 31.26 31.27 # Rules to configure and make the package. 31.28 compile_rules() 31.29 { 31.30 - ./configure $CONFIGURE_ARGS && 31.31 - make && make install 31.32 + ./configure $CONFIGURE_ARGS && make && make install 31.33 } 31.34 31.35 # Rules to gen a SliTaz package suitable for Tazpkg. 31.36 genpkg_rules() 31.37 { 31.38 - mkdir -p $fs/usr/bin $fs/usr/lib 31.39 - cp -a $install/usr/bin/fribidi $fs/usr/bin 31.40 - cp -a $install/usr/lib/*.so* $fs/usr/lib 31.41 + cook_copy_files fribidi *.so* 31.42 } 31.43 -
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/gcr-base/receipt Fri Apr 21 14:48:05 2017 +0300 32.3 @@ -0,0 +1,18 @@ 32.4 +# SliTaz package receipt. 32.5 + 32.6 +PACKAGE="gcr-base" 32.7 +VERSION="3.20.0" 32.8 +CATEGORY="security" 32.9 +SHORT_DESC="Displaying certificates and accessing key stores (base files)" 32.10 +MAINTAINER="al.bobylev@gmail.com" 32.11 +LICENSE="GPL2" 32.12 +WEB_SITE="https://developer.gnome.org/gcr/" 32.13 + 32.14 +WANTED="gcr" 32.15 +DEPENDS="glib libffi libgcrypt libgio libgpg-error p11-kit pcre zlib" 32.16 + 32.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 32.18 +genpkg_rules() 32.19 +{ 32.20 + cook_copy_files libgcr-base-3.so* libgck-1.so* 32.21 +}
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/gcr-dev/receipt Fri Apr 21 14:48:05 2017 +0300 33.3 @@ -0,0 +1,22 @@ 33.4 +# SliTaz package receipt. 33.5 + 33.6 +PACKAGE="gcr-dev" 33.7 +VERSION="3.20.0" 33.8 +CATEGORY="development" 33.9 +SHORT_DESC="Displaying certificates and accessing key stores (development files)" 33.10 +MAINTAINER="al.bobylev@gmail.com" 33.11 +LICENSE="GPL2" 33.12 +WEB_SITE="https://developer.gnome.org/gcr/" 33.13 + 33.14 +WANTED="gcr" 33.15 +DEPENDS="gcr gcr-base atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \ 33.16 +gdk-pixbuf-dev glib-dev glibc-dev gtk+3-dev harfbuzz-dev libffi-dev libgcrypt-dev \ 33.17 +libgio-dev libgpg-error-dev liblzma-dev libpng-dev libxcb-dev libxml2-dev \ 33.18 +p11-kit-dev pango-dev pcre-dev pixman-dev xorg-libX11-dev xorg-libXau-dev \ 33.19 +xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev zlib-dev" 33.20 + 33.21 +# Rules to gen a SliTaz package suitable for Tazpkg. 33.22 +genpkg_rules() 33.23 +{ 33.24 + cook_copy_files *.h *.la *.pc *.typelib *.gir *.vapi *.deps 33.25 +}
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/gcr/receipt Fri Apr 21 14:48:05 2017 +0300 34.3 @@ -0,0 +1,41 @@ 34.4 +# SliTaz package receipt. 34.5 + 34.6 +PACKAGE="gcr" 34.7 +VERSION="3.20.0" 34.8 +CATEGORY="security" 34.9 +SHORT_DESC="Displaying certificates and accessing key stores" 34.10 +MAINTAINER="al.bobylev@gmail.com" 34.11 +LICENSE="GPL2" 34.12 +WEB_SITE="https://developer.gnome.org/gcr/" 34.13 + 34.14 +TARBALL="$PACKAGE-$VERSION.tar.xz" 34.15 +WGET_URL="$GNOME_MIRROR/gcr/${VERSION%.*}/$TARBALL" 34.16 + 34.17 +DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+3 harfbuzz \ 34.18 +libffi libgcrypt libgio libgpg-error liblzma libpng libxcb libxml2 p11-kit pango \ 34.19 +pcre pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender \ 34.20 +zlib" 34.21 +BUILD_DEPENDS="intltool gtk-doc gobject-introspection-dev gtk+3-dev vala \ 34.22 +p11-kit-dev" 34.23 +SPLIT="gcr-base" 34.24 + 34.25 +# Rules to configure and make the package. 34.26 +compile_rules() 34.27 +{ 34.28 + sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml && 34.29 + 34.30 + ./configure \ 34.31 + --sysconfdir=/etc \ 34.32 + $CONFIGURE_ARGS && 34.33 + make && make install 34.34 +} 34.35 + 34.36 +# Rules to gen a SliTaz package suitable for Tazpkg. 34.37 +genpkg_rules() 34.38 +{ 34.39 + cook_copy_folders bin libexec GConf applications dbus-1 glib-2.0 mime 34.40 + cook_copy_files *.so* *.mo *.ui 34.41 + cook_copy_icons 34.42 + # split gcr-base 34.43 + find $fs \( -name 'libgck-1.so*' -o -name 'libgcr-base-3.so*' \) -delete 34.44 +}
35.1 --- a/glib-networking-dev/receipt Sat Apr 15 16:06:43 2017 +0300 35.2 +++ b/glib-networking-dev/receipt Fri Apr 21 14:48:05 2017 +0300 35.3 @@ -1,20 +1,20 @@ 35.4 # SliTaz package receipt. 35.5 35.6 PACKAGE="glib-networking-dev" 35.7 -VERSION="2.43.1" 35.8 +VERSION="2.48.2" 35.9 CATEGORY="development" 35.10 -SHORT_DESC="The glib-networking devel files." 35.11 +SHORT_DESC="TLS support for glib (development files)" 35.12 MAINTAINER="pankso@slitaz.org" 35.13 LICENSE="LGPL2" 35.14 -WANTED="glib-networking" 35.15 WEB_SITE="http://www.gtk.org/" 35.16 HOST_ARCH="i486 arm" 35.17 35.18 -DEPENDS="glib-networking" 35.19 +WANTED="glib-networking" 35.20 +DEPENDS="glib-networking glib-dev glibc-dev gmp-dev gnutls-dev libffi-dev \ 35.21 +libgio-dev libtasn1-dev nettle-dev p11-kit-dev pcre-dev zlib-dev" 35.22 35.23 # Rules to gen a SliTaz package suitable for Tazpkg. 35.24 genpkg_rules() 35.25 { 35.26 - mkdir -p $fs/usr/lib/gio/modules 35.27 - cp -a $install/usr/lib/gio/modules/*.*a $fs/usr/lib/gio/modules 35.28 -} 35.29 \ No newline at end of file 35.30 + cook_copy_files *.la 35.31 +}
36.1 --- a/glib-networking/receipt Sat Apr 15 16:06:43 2017 +0300 36.2 +++ b/glib-networking/receipt Fri Apr 21 14:48:05 2017 +0300 36.3 @@ -1,30 +1,32 @@ 36.4 # SliTaz package receipt. 36.5 36.6 PACKAGE="glib-networking" 36.7 -VERSION="2.43.1" 36.8 +VERSION="2.48.2" 36.9 CATEGORY="x-window" 36.10 -SHORT_DESC="TLS support for glib." 36.11 +SHORT_DESC="TLS support for glib" 36.12 MAINTAINER="pankso@slitaz.org" 36.13 LICENSE="LGPL2" 36.14 -TARBALL="$PACKAGE-$VERSION.tar.xz" 36.15 WEB_SITE="http://www.gtk.org/" 36.16 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 36.17 HOST_ARCH="i486 arm" 36.18 36.19 -DEPENDS="glib libgio libgnutls" 36.20 -BUILD_DEPENDS="glib-dev libgio-dev gnutls-dev " 36.21 +TARBALL="$PACKAGE-$VERSION.tar.xz" 36.22 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 36.23 + 36.24 +DEPENDS="glib gmp libffi libgio libgnutls libtasn1 nettle p11-kit pcre zlib" 36.25 +BUILD_DEPENDS_arm="glib-dev libgio-dev gnutls-dev" 36.26 +BUILD_DEPENDS="intltool gnutls-dev gsettings-desktop-schemas" 36.27 36.28 # Handle cross compilation. 36.29 case "$ARCH" in 36.30 - i?86) BUILD_DEPENDS="$BUILD_DEPENDS intltool automake autoconf" ;; 36.31 + arm*) BUILD_DEPENDS=$BUILD_DEPENDS_arm ;; 36.32 esac 36.33 36.34 # Rules to configure and make the package. 36.35 compile_rules() 36.36 { 36.37 ./configure \ 36.38 - --prefix=/usr \ 36.39 - --without-ca-certificates \ 36.40 + --with-ca-certificates=/etc/ssl/ca-bundle.crt \ 36.41 + --disable-static \ 36.42 $CONFIGURE_ARGS && 36.43 make && make install 36.44 } 36.45 @@ -32,6 +34,5 @@ 36.46 # Rules to gen a SliTaz package suitable for Tazpkg. 36.47 genpkg_rules() 36.48 { 36.49 - mkdir -p $fs/usr/lib/gio/modules 36.50 - cp -a $install/usr/lib/gio/modules/*.so* $fs/usr/lib/gio/modules 36.51 -} 36.52 \ No newline at end of file 36.53 + cook_copy_files *.so* 36.54 +}
37.1 --- a/gnutls-dev/receipt Sat Apr 15 16:06:43 2017 +0300 37.2 +++ b/gnutls-dev/receipt Fri Apr 21 14:48:05 2017 +0300 37.3 @@ -1,23 +1,20 @@ 37.4 # SliTaz package receipt. 37.5 37.6 PACKAGE="gnutls-dev" 37.7 -VERSION="3.3.16" 37.8 +VERSION="3.5.3" 37.9 CATEGORY="development" 37.10 -SHORT_DESC="GNU Transport Layer Security Library headers" 37.11 +SHORT_DESC="GNU Transport Layer Security Library (development files)" 37.12 MAINTAINER="erjo@slitaz.org" 37.13 LICENSE="GPL3" 37.14 -WANTED="gnutls" 37.15 -WEB_SITE="http://www.gnu.org/software/gnutls/" 37.16 +WEB_SITE="http://gnutls.org/" 37.17 HOST_ARCH="i486 arm" 37.18 37.19 -DEPENDS="gnutls libtasn1-dev libgcrypt-dev libgpg-error-dev p11-kit-dev \ 37.20 -zlib-dev nettle-dev gmp-dev pkg-config" 37.21 +WANTED="gnutls" 37.22 +DEPENDS="gnutls libgnutls glibc-dev gmp-dev libffi-dev libtasn1-dev nettle-dev \ 37.23 +p11-kit-dev zlib-dev" 37.24 37.25 # Rules to gen a SliTaz package suitable for Tazpkg. 37.26 genpkg_rules() 37.27 { 37.28 - mkdir -p $fs/usr/lib 37.29 - cp -a $install/usr/lib/*.*a $fs/usr/lib 37.30 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 37.31 - cp -a $install/usr/include $fs/usr 37.32 -} 37.33 \ No newline at end of file 37.34 + cook_copy_files *.h *.la *.pc 37.35 +}
38.1 --- a/gnutls/receipt Sat Apr 15 16:06:43 2017 +0300 38.2 +++ b/gnutls/receipt Fri Apr 21 14:48:05 2017 +0300 38.3 @@ -1,51 +1,54 @@ 38.4 # SliTaz package receipt. 38.5 38.6 PACKAGE="gnutls" 38.7 -VERSION="3.3.16" 38.8 +VERSION="3.5.3" 38.9 CATEGORY="security" 38.10 SHORT_DESC="GNU Transport Layer Security Library" 38.11 MAINTAINER="erjo@slitaz.org" 38.12 LICENSE="GPL3" 38.13 -TARBALL="$PACKAGE-$VERSION.tar.lz" 38.14 -WEB_SITE="http://www.gnu.org/software/gnutls/" 38.15 +WEB_SITE="http://gnutls.org/" 38.16 +HOST_ARCH="i486 arm" 38.17 +SUGGESTED="cacerts" 38.18 + 38.19 +TARBALL="$PACKAGE-$VERSION.tar.xz" 38.20 WGET_URL="ftp://ftp.gnutls.org/gcrypt/gnutls/v${VERSION%.*}/$TARBALL" 38.21 -HOST_ARCH="i486 arm" 38.22 38.23 -DEPENDS="nettle libgpg-error ncurses readline zlib gcc-lib-base 38.24 +DEPENDS="gmp libffi libtasn1 nettle p11-kit zlib" 38.25 +BUILD_DEPENDS="nettle-dev libtasn1-dev gtk-doc gettext p11-kit-dev" 38.26 + 38.27 +DEPENDS_arm="nettle libgpg-error ncurses readline zlib gcc-lib-base \ 38.28 libgnutls libcrypto libtasn1" 38.29 -BUILD_DEPENDS="libtasn1-dev ncurses-dev readline-dev nettle-dev 38.30 +BUILD_DEPENDS_arm="libtasn1-dev ncurses-dev readline-dev nettle-dev \ 38.31 libgpg-error-dev libgcrypt-dev libcrypto-dev gmp-dev lzip" 38.32 -SUGGESTED="cacerts" 38.33 + 38.34 +SPLIT="libgnutls gnutls-dev" 38.35 38.36 # Handle SliTaz arch. 38.37 case "$SLITAZ_ARCH" in 38.38 - i?86) DEPENDS="$DEPENDS p11-kit" ;; 38.39 + arm*) DEPENDS=$DEPENDS_arm ;; 38.40 esac 38.41 38.42 # Handle cross compilation. 38.43 case "$ARCH" in 38.44 - i?86) 38.45 - BUILD_DEPENDS="$BUILD_DEPENDS p11-kit-dev cacerts" ;; 38.46 - arm*) 38.47 + arm*) 38.48 + BUILD_DEPENDS=$BUILD_DEPENDS_arm 38.49 ARCH_ARGS="--with-libgcrypt-prefix=/cross/$ARCH/sysroot/usr \ 38.50 - --without-p11-kit --disable-rpath" ;; 38.51 + --without-p11-kit --disable-rpath --with-libgcrypt --disable-guile \ 38.52 + --with-zlib" ;; 38.53 esac 38.54 38.55 # Rules to configure and make the package. 38.56 compile_rules() 38.57 { 38.58 ./configure \ 38.59 - --with-libgcrypt \ 38.60 - --disable-guile \ 38.61 - --with-zlib \ 38.62 --with-default-trust-store-file="/etc/ssl/ca-bundle.crt" \ 38.63 $CONFIGURE_ARGS ${ARCH_ARGS} && 38.64 - make && make install 38.65 + make && make install && 38.66 + make -C doc/reference install-data-local 38.67 } 38.68 38.69 # Rules to gen a SliTaz package suitable for Tazpkg. 38.70 genpkg_rules() 38.71 { 38.72 - mkdir -p $fs/usr 38.73 - cp -a $install/usr/bin $fs/usr 38.74 + cook_copy_folders bin 38.75 }
39.1 --- a/gnutls/stuff/CVE-2014-0092.u Sat Apr 15 16:06:43 2017 +0300 39.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 39.3 @@ -1,102 +0,0 @@ 39.4 -From 6aa26f78150ccbdf0aec1878a41c17c41d358a3b Mon Sep 17 00:00:00 2001 39.5 -From: Nikos Mavrogiannopoulos <nmav@gnutls.org> 39.6 -Date: Thu, 27 Feb 2014 19:42:26 +0100 39.7 -Subject: [PATCH] corrected return codes 39.8 - 39.9 ---- 39.10 - lib/x509/verify.c | 16 ++++++++++------ 39.11 - 1 files changed, 10 insertions(+), 6 deletions(-) 39.12 - 39.13 -diff --git a/lib/x509/verify.c b/lib/x509/verify.c 39.14 -index c9a6b0d..eef85a8 100644 39.15 ---- a/lib/x509/verify.c 39.16 -+++ b/lib/x509/verify.c 39.17 -@@ -141,7 +141,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer, 39.18 - if (result < 0) 39.19 - { 39.20 - gnutls_assert (); 39.21 -- goto cleanup; 39.22 -+ goto fail; 39.23 - } 39.24 - 39.25 - result = 39.26 -@@ -150,7 +150,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer, 39.27 - if (result < 0) 39.28 - { 39.29 - gnutls_assert (); 39.30 -- goto cleanup; 39.31 -+ goto fail; 39.32 - } 39.33 - 39.34 - result = 39.35 -@@ -158,7 +158,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer, 39.36 - if (result < 0) 39.37 - { 39.38 - gnutls_assert (); 39.39 -- goto cleanup; 39.40 -+ goto fail; 39.41 - } 39.42 - 39.43 - result = 39.44 -@@ -166,7 +166,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer, 39.45 - if (result < 0) 39.46 - { 39.47 - gnutls_assert (); 39.48 -- goto cleanup; 39.49 -+ goto fail; 39.50 - } 39.51 - 39.52 - /* If the subject certificate is the same as the issuer 39.53 -@@ -206,6 +206,7 @@ check_if_ca (gnutls_x509_crt_t cert, gnutls_x509_crt_t issuer, 39.54 - else 39.55 - gnutls_assert (); 39.56 - 39.57 -+fail: 39.58 - result = 0; 39.59 - 39.60 - cleanup: 39.61 -@@ -330,7 +331,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert, 39.62 - gnutls_datum_t cert_signed_data = { NULL, 0 }; 39.63 - gnutls_datum_t cert_signature = { NULL, 0 }; 39.64 - gnutls_x509_crt_t issuer = NULL; 39.65 -- int issuer_version, result; 39.66 -+ int issuer_version, result = 0; 39.67 - 39.68 - if (output) 39.69 - *output = 0; 39.70 -@@ -363,7 +364,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert, 39.71 - if (issuer_version < 0) 39.72 - { 39.73 - gnutls_assert (); 39.74 -- return issuer_version; 39.75 -+ return 0; 39.76 - } 39.77 - 39.78 - if (!(flags & GNUTLS_VERIFY_DISABLE_CA_SIGN) && 39.79 -@@ -385,6 +386,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert, 39.80 - if (result < 0) 39.81 - { 39.82 - gnutls_assert (); 39.83 -+ result = 0; 39.84 - goto cleanup; 39.85 - } 39.86 - 39.87 -@@ -393,6 +395,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert, 39.88 - if (result < 0) 39.89 - { 39.90 - gnutls_assert (); 39.91 -+ result = 0; 39.92 - goto cleanup; 39.93 - } 39.94 - 39.95 -@@ -410,6 +413,7 @@ _gnutls_verify_certificate2 (gnutls_x509_crt_t cert, 39.96 - else if (result < 0) 39.97 - { 39.98 - gnutls_assert(); 39.99 -+ result = 0; 39.100 - goto cleanup; 39.101 - } 39.102 - 39.103 --- 39.104 -1.7.1 39.105 -
40.1 --- a/gsettings-desktop-schemas/receipt Sat Apr 15 16:06:43 2017 +0300 40.2 +++ b/gsettings-desktop-schemas/receipt Fri Apr 21 14:48:05 2017 +0300 40.3 @@ -1,29 +1,30 @@ 40.4 # SliTaz package receipt. 40.5 40.6 PACKAGE="gsettings-desktop-schemas" 40.7 -VERSION="3.12.2" 40.8 +VERSION="3.20.0" 40.9 CATEGORY="x-window" 40.10 SHORT_DESC="Collection of GSettings schemas for settings shared by various components of a GNOME Desktop" 40.11 MAINTAINER="al.bobylev@gmail.com" 40.12 LICENSE="LGPL2.1" 40.13 +WEB_SITE="http://www.gnome.org/" 40.14 + 40.15 TARBALL="$PACKAGE-$VERSION.tar.xz" 40.16 -WEB_SITE="http://www.gnome.org/" 40.17 -WGET_URL="http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/${VERSION%.*}/$TARBALL" 40.18 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 40.19 40.20 -DEPENDS="" 40.21 -BUILD_DEPENDS="libgio-dev glib-dev" 40.22 +DEPENDS="glib" 40.23 +BUILD_DEPENDS="libgio-dev glib-dev gobject-introspection-dev intltool" 40.24 40.25 # Rules to configure and make the package. 40.26 compile_rules() 40.27 { 40.28 - cd $src 40.29 - ./configure --prefix=/usr && 40.30 - make && 40.31 - make DESTDIR=$DESTDIR install 40.32 + sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in && 40.33 + 40.34 + ./configure $CONFIGURE_ARGS && make && make install 40.35 } 40.36 40.37 # Rules to gen a SliTaz package suitable for Tazpkg. 40.38 genpkg_rules() 40.39 { 40.40 - cp -a $install/usr $fs 40.41 + cook_copy_folders usr 40.42 + rm -rf $fs/usr/share/locale 40.43 }
41.1 --- a/gtk+-dev/receipt Sat Apr 15 16:06:43 2017 +0300 41.2 +++ b/gtk+-dev/receipt Fri Apr 21 14:48:05 2017 +0300 41.3 @@ -19,5 +19,5 @@ 41.4 # Rules to gen a SliTaz package suitable for Tazpkg. 41.5 genpkg_rules() 41.6 { 41.7 - cook_copy_files *.h *.la *.pc *.m4 41.8 + cook_copy_files *.h *.la *.pc *.m4 *.typelib *.gir 41.9 }
42.1 --- a/gtk+3-dev/receipt Sat Apr 15 16:06:43 2017 +0300 42.2 +++ b/gtk+3-dev/receipt Fri Apr 21 14:48:05 2017 +0300 42.3 @@ -9,7 +9,7 @@ 42.4 WEB_SITE="https://www.gtk.org/" 42.5 42.6 WANTED="gtk+3" 42.7 -DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-browser \ 42.8 +DEPENDS="gtk+3 gtk+3-demo gtk+3-icon-browser gtk+3-widget-factory \ 42.9 at-spi2-atk-dev at-spi2-core-dev atk-dev bzip2-dev cairo-dev \ 42.10 colord-dev cups-dev dbus-dev eudev-dev fontconfig-dev freetype-dev \ 42.11 gdk-pixbuf-dev glib-dev glibc-dev gnutls-dev harfbuzz-dev lcms2-dev \
43.1 --- a/gtk-doc/receipt Sat Apr 15 16:06:43 2017 +0300 43.2 +++ b/gtk-doc/receipt Fri Apr 21 14:48:05 2017 +0300 43.3 @@ -11,6 +11,7 @@ 43.4 TARBALL="$PACKAGE-$VERSION.tar.xz" 43.5 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL" 43.6 43.7 +DEPENDS="docbook-xsl" 43.8 BUILD_DEPENDS="docbook-xml docbook-xsl libxslt python perl itstool gettext" 43.9 43.10 # Rules to configure and make the package.
44.1 --- a/gvfs-afp/receipt Sat Apr 15 16:06:43 2017 +0300 44.2 +++ b/gvfs-afp/receipt Fri Apr 21 14:48:05 2017 +0300 44.3 @@ -1,7 +1,7 @@ 44.4 # SliTaz package receipt. 44.5 44.6 PACKAGE="gvfs-afp" 44.7 -VERSION="1.22.1" 44.8 +VERSION="1.28.3" 44.9 CATEGORY="system-tools" 44.10 SHORT_DESC="Apple Filing Protocol support for gvfs (afp:///)" 44.11 MAINTAINER="al.bobylev@gmail.com" 44.12 @@ -9,10 +9,11 @@ 44.13 WEB_SITE="http://www.gnome.org/" 44.14 44.15 WANTED="gvfs" 44.16 -DEPENDS="gvfs glib glibc-base libffi libgcrypt libgio libgpg-error pcre zlib" 44.17 +DEPENDS="gcr-base glib gvfs libffi libgcrypt libgio libgpg-error p11-kit pcre \ 44.18 +zlib" 44.19 44.20 # Rules to gen a SliTaz package suitable for Tazpkg. 44.21 genpkg_rules() 44.22 { 44.23 - . $WOK/gvfs/stuff/split 44.24 + . $wanted_stuff/split 44.25 }
45.1 --- a/gvfs-archive/receipt Sat Apr 15 16:06:43 2017 +0300 45.2 +++ b/gvfs-archive/receipt Fri Apr 21 14:48:05 2017 +0300 45.3 @@ -1,7 +1,7 @@ 45.4 # SliTaz package receipt. 45.5 45.6 PACKAGE="gvfs-archive" 45.7 -VERSION="1.22.1" 45.8 +VERSION="1.28.3" 45.9 CATEGORY="system-tools" 45.10 SHORT_DESC="Archive support for gvfs (archive:///)" 45.11 MAINTAINER="al.bobylev@gmail.com" 45.12 @@ -9,11 +9,12 @@ 45.13 WEB_SITE="http://www.gnome.org/" 45.14 45.15 WANTED="gvfs" 45.16 -DEPENDS="gvfs acl attr bzlib glib glibc-base libarchive libffi libgio liblzma \ 45.17 -libxml2 pcre zlib" 45.18 +DEPENDS="acl attr bzlib gcr-base glib gvfs libarchive libcrypto libffi \ 45.19 +libgcrypt libgio libgpg-error liblzma libxml2 lz4-lib lzo nettle p11-kit pcre \ 45.20 +zlib" 45.21 45.22 # Rules to gen a SliTaz package suitable for Tazpkg. 45.23 genpkg_rules() 45.24 { 45.25 - . $WOK/gvfs/stuff/split 45.26 + . $wanted_stuff/split 45.27 }
46.1 --- a/gvfs-cdda/receipt Sat Apr 15 16:06:43 2017 +0300 46.2 +++ b/gvfs-cdda/receipt Fri Apr 21 14:48:05 2017 +0300 46.3 @@ -1,7 +1,7 @@ 46.4 # SliTaz package receipt. 46.5 46.6 PACKAGE="gvfs-cdda" 46.7 -VERSION="1.22.1" 46.8 +VERSION="1.28.3" 46.9 CATEGORY="system-tools" 46.10 SHORT_DESC="CDDA support for gvfs" 46.11 MAINTAINER="al.bobylev@gmail.com" 46.12 @@ -9,10 +9,11 @@ 46.13 WEB_SITE="http://www.gnome.org/" 46.14 46.15 WANTED="gvfs" 46.16 -DEPENDS="gvfs glib glibc-base libcdio libffi libgio libgudev pcre udev zlib" 46.17 +DEPENDS="eudev gcr-base glib gvfs libcdio libffi libgcrypt libgio libgpg-error \ 46.18 +libgudev p11-kit pcre zlib" 46.19 46.20 # Rules to gen a SliTaz package suitable for Tazpkg. 46.21 genpkg_rules() 46.22 { 46.23 - . $WOK/gvfs/stuff/split 46.24 + . $wanted_stuff/split 46.25 }
47.1 --- a/gvfs-dev/receipt Sat Apr 15 16:06:43 2017 +0300 47.2 +++ b/gvfs-dev/receipt Fri Apr 21 14:48:05 2017 +0300 47.3 @@ -1,18 +1,21 @@ 47.4 # SliTaz package receipt. 47.5 47.6 PACKAGE="gvfs-dev" 47.7 -VERSION="1.22.1" 47.8 +VERSION="1.28.3" 47.9 CATEGORY="development" 47.10 -SHORT_DESC="Userspace virtual filesystem (development)" 47.11 +SHORT_DESC="Userspace virtual filesystem (development files)" 47.12 MAINTAINER="pankso@slitaz.org" 47.13 LICENSE="GPL2" 47.14 WEB_SITE="http://www.gnome.org/" 47.15 47.16 WANTED="gvfs" 47.17 -DEPENDS="gvfs glib-dev udev-dev" 47.18 +DEPENDS="gvfs gvfs-afp gvfs-archive gvfs-cdda gvfs-fuse gvfs-gphoto2 gvfs-gtk \ 47.19 +gvfs-http gvfs-libmtp gvfs-obexftp gvfs-smb gvfs-udisks2 \ 47.20 +gcr-dev glib-dev glibc-dev libffi-dev libgcrypt-dev libgio-dev libgpg-error-dev \ 47.21 +p11-kit-dev pcre-dev zlib-dev" 47.22 47.23 # Rules to gen a SliTaz package suitable for Tazpkg. 47.24 genpkg_rules() 47.25 { 47.26 - . $WOK/gvfs/stuff/split 47.27 + . $wanted_stuff/split 47.28 }
48.1 --- a/gvfs-fuse/receipt Sat Apr 15 16:06:43 2017 +0300 48.2 +++ b/gvfs-fuse/receipt Fri Apr 21 14:48:05 2017 +0300 48.3 @@ -1,7 +1,7 @@ 48.4 # SliTaz package receipt. 48.5 48.6 PACKAGE="gvfs-fuse" 48.7 -VERSION="1.22.1" 48.8 +VERSION="1.28.3" 48.9 CATEGORY="system-tools" 48.10 SHORT_DESC="FUSE support for gvfs" 48.11 MAINTAINER="al.bobylev@gmail.com" 48.12 @@ -9,10 +9,10 @@ 48.13 WEB_SITE="http://www.gnome.org/" 48.14 48.15 WANTED="gvfs" 48.16 -DEPENDS="gvfs fuse glib glibc-base libffi libgio pcre zlib" 48.17 +DEPENDS="fuse glib gvfs libffi libgio pcre zlib" 48.18 48.19 # Rules to gen a SliTaz package suitable for Tazpkg. 48.20 genpkg_rules() 48.21 { 48.22 - . $WOK/gvfs/stuff/split 48.23 + . $wanted_stuff/split 48.24 }
49.1 --- a/gvfs-gphoto2/receipt Sat Apr 15 16:06:43 2017 +0300 49.2 +++ b/gvfs-gphoto2/receipt Fri Apr 21 14:48:05 2017 +0300 49.3 @@ -1,7 +1,7 @@ 49.4 # SliTaz package receipt. 49.5 49.6 PACKAGE="gvfs-gphoto2" 49.7 -VERSION="1.22.1" 49.8 +VERSION="1.28.3" 49.9 CATEGORY="system-tools" 49.10 SHORT_DESC="Gphoto2 support for gvfs" 49.11 MAINTAINER="al.bobylev@gmail.com" 49.12 @@ -9,11 +9,11 @@ 49.13 WEB_SITE="http://www.gnome.org/" 49.14 49.15 WANTED="gvfs" 49.16 -DEPENDS="gvfs glib glibc-base libexif libffi libgio libgphoto2 libgudev \ 49.17 -libltdl libusb libusb-compat pcre udev zlib" 49.18 +DEPENDS="eudev gcr-base glib gvfs libexif libffi libgcrypt libgio libgpg-error \ 49.19 +libgphoto2 libgudev libltdl p11-kit pcre zlib" 49.20 49.21 # Rules to gen a SliTaz package suitable for Tazpkg. 49.22 genpkg_rules() 49.23 { 49.24 - . $WOK/gvfs/stuff/split 49.25 + . $wanted_stuff/split 49.26 }
50.1 --- a/gvfs-gtk/receipt Sat Apr 15 16:06:43 2017 +0300 50.2 +++ b/gvfs-gtk/receipt Fri Apr 21 14:48:05 2017 +0300 50.3 @@ -1,7 +1,7 @@ 50.4 # SliTaz package receipt. 50.5 50.6 PACKAGE="gvfs-gtk" 50.7 -VERSION="1.22.1" 50.8 +VERSION="1.28.3" 50.9 CATEGORY="system-tools" 50.10 SHORT_DESC="Recent files support for gvfs (GTK+3) (recent:///)" 50.11 MAINTAINER="al.bobylev@gmail.com" 50.12 @@ -9,14 +9,13 @@ 50.13 WEB_SITE="http://www.gnome.org/" 50.14 50.15 WANTED="gvfs" 50.16 -DEPENDS="gvfs atk bzlib cairo fontconfig freetype gcc-lib-base gdk-pixbuf glib \ 50.17 -glibc-base gtk+3 harfbuzz libffi libgio libpng libxcb libxml2 pango pcre \ 50.18 -pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \ 50.19 -xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXi \ 50.20 -xorg-libXinerama xorg-libXrandr xorg-libXrender zlib" 50.21 +DEPENDS="atk bzlib cairo fontconfig freetype gcr-base gdk-pixbuf glib gtk+3 gvfs \ 50.22 +harfbuzz libffi libgcrypt libgio libgpg-error liblzma libpng libxcb libxml2 p11-kit \ 50.23 +pango pcre pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender \ 50.24 +zlib" 50.25 50.26 # Rules to gen a SliTaz package suitable for Tazpkg. 50.27 genpkg_rules() 50.28 { 50.29 - . $WOK/gvfs/stuff/split 50.30 + . $wanted_stuff/split 50.31 }
51.1 --- a/gvfs-http/receipt Sat Apr 15 16:06:43 2017 +0300 51.2 +++ b/gvfs-http/receipt Fri Apr 21 14:48:05 2017 +0300 51.3 @@ -1,7 +1,7 @@ 51.4 # SliTaz package receipt. 51.5 51.6 PACKAGE="gvfs-http" 51.7 -VERSION="1.22.1" 51.8 +VERSION="1.28.3" 51.9 CATEGORY="system-tools" 51.10 SHORT_DESC="HTTP/WebDAV support for gvfs" 51.11 MAINTAINER="al.bobylev@gmail.com" 51.12 @@ -9,10 +9,11 @@ 51.13 WEB_SITE="http://www.gnome.org/" 51.14 51.15 WANTED="gvfs" 51.16 -DEPENDS="gvfs glib glibc-base libffi libgio libsoup libsqlite libxml2 pcre zlib" 51.17 +DEPENDS="gcr-base glib gvfs libffi libgcrypt libgio libgpg-error liblzma libsoup \ 51.18 +libsqlite libxml2 p11-kit pcre zlib" 51.19 51.20 # Rules to gen a SliTaz package suitable for Tazpkg. 51.21 genpkg_rules() 51.22 { 51.23 - . $WOK/gvfs/stuff/split 51.24 + . $wanted_stuff/split 51.25 }
52.1 --- a/gvfs-libmtp/receipt Sat Apr 15 16:06:43 2017 +0300 52.2 +++ b/gvfs-libmtp/receipt Fri Apr 21 14:48:05 2017 +0300 52.3 @@ -1,7 +1,7 @@ 52.4 # SliTaz package receipt. 52.5 52.6 PACKAGE="gvfs-libmtp" 52.7 -VERSION="1.22.1" 52.8 +VERSION="1.28.3" 52.9 CATEGORY="system-tools" 52.10 SHORT_DESC="MTP support for gvfs" 52.11 MAINTAINER="al.bobylev@gmail.com" 52.12 @@ -9,11 +9,11 @@ 52.13 WEB_SITE="http://www.gnome.org/" 52.14 52.15 WANTED="gvfs" 52.16 -DEPENDS="gvfs glib glibc-base libffi libgio libgudev libmtp libusb pcre udev \ 52.17 -zlib" 52.18 +DEPENDS="eudev gcr-base glib gvfs libffi libgcrypt libgio libgpg-error libgudev libmtp \ 52.19 +libusb p11-kit pcre zlib" 52.20 52.21 # Rules to gen a SliTaz package suitable for Tazpkg. 52.22 genpkg_rules() 52.23 { 52.24 - . $WOK/gvfs/stuff/split 52.25 + . $wanted_stuff/split 52.26 }
53.1 --- a/gvfs-obexftp/receipt Sat Apr 15 16:06:43 2017 +0300 53.2 +++ b/gvfs-obexftp/receipt Fri Apr 21 14:48:05 2017 +0300 53.3 @@ -1,7 +1,7 @@ 53.4 # SliTaz package receipt. 53.5 53.6 PACKAGE="gvfs-obexftp" 53.7 -VERSION="1.22.1" 53.8 +VERSION="1.28.3" 53.9 CATEGORY="system-tools" 53.10 SHORT_DESC="ObexFTP support for gvfs" 53.11 MAINTAINER="al.bobylev@gmail.com" 53.12 @@ -15,5 +15,5 @@ 53.13 # Rules to gen a SliTaz package suitable for Tazpkg. 53.14 genpkg_rules() 53.15 { 53.16 - . $WOK/gvfs/stuff/split 53.17 + . $wanted_stuff/split 53.18 }
54.1 --- a/gvfs-smb/receipt Sat Apr 15 16:06:43 2017 +0300 54.2 +++ b/gvfs-smb/receipt Fri Apr 21 14:48:05 2017 +0300 54.3 @@ -1,7 +1,7 @@ 54.4 # SliTaz package receipt. 54.5 54.6 PACKAGE="gvfs-smb" 54.7 -VERSION="1.22.1" 54.8 +VERSION="1.28.3" 54.9 CATEGORY="system-tools" 54.10 SHORT_DESC="Samba support for gvfs (smb:///)" 54.11 MAINTAINER="pankso@slitaz.org" 54.12 @@ -15,5 +15,5 @@ 54.13 # Rules to gen a SliTaz package suitable for Tazpkg. 54.14 genpkg_rules() 54.15 { 54.16 - . $WOK/gvfs/stuff/split 54.17 + . $wanted_stuff/split 54.18 }
55.1 --- a/gvfs-udisks2/receipt Sat Apr 15 16:06:43 2017 +0300 55.2 +++ b/gvfs-udisks2/receipt Fri Apr 21 14:48:05 2017 +0300 55.3 @@ -1,7 +1,7 @@ 55.4 # SliTaz package receipt. 55.5 55.6 PACKAGE="gvfs-udisks2" 55.7 -VERSION="1.22.1" 55.8 +VERSION="1.28.3" 55.9 CATEGORY="system-tools" 55.10 SHORT_DESC="Udisks2 volume monitor for gvfs" 55.11 MAINTAINER="pankso@slitaz.org" 55.12 @@ -9,11 +9,10 @@ 55.13 WEB_SITE="http://www.gnome.org/" 55.14 55.15 WANTED="gvfs" 55.16 -DEPENDS="gvfs glib glibc-base libffi libgio libgudev pcre udev \ 55.17 -udisks2 zlib dbus-helper" 55.18 +DEPENDS="eudev glib gvfs libffi libgio libgudev pcre udisks2 zlib" 55.19 55.20 # Rules to gen a SliTaz package suitable for Tazpkg. 55.21 genpkg_rules() 55.22 { 55.23 - . $WOK/gvfs/stuff/split 55.24 + . $wanted_stuff/split 55.25 }
56.1 --- a/gvfs/receipt Sat Apr 15 16:06:43 2017 +0300 56.2 +++ b/gvfs/receipt Fri Apr 21 14:48:05 2017 +0300 56.3 @@ -1,34 +1,37 @@ 56.4 # SliTaz package receipt. 56.5 56.6 PACKAGE="gvfs" 56.7 -VERSION="1.22.1" 56.8 +VERSION="1.28.3" 56.9 CATEGORY="system-tools" 56.10 SHORT_DESC="Userspace virtual filesystem designed to work with gio" 56.11 MAINTAINER="pankso@slitaz.org" 56.12 LICENSE="GPL2" 56.13 -TARBALL="$PACKAGE-$VERSION.tar.xz" 56.14 WEB_SITE="http://www.gnome.org/" 56.15 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 56.16 SUGGESTED="gvfs-afp gvfs-archive gvfs-cdda gvfs-fuse gvfs-gphoto2 gvfs-http \ 56.17 gvfs-libmtp gvfs-obexftp gvfs-smb gvfs-udisks2" 56.18 56.19 +TARBALL="$PACKAGE-$VERSION.tar.xz" 56.20 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 56.21 + 56.22 DEPENDS="dbus glib glibc-base libffi libgio pcre udev zlib" 56.23 -BUILD_DEPENDS="dbus-dev glib-dev udev-dev libgudev-dev fuse-dev \ 56.24 -udisks2-dev samba-dev smbclient expat-dev libarchive-dev libgcrypt-dev \ 56.25 -libsoup-dev libxml2-dev libcdio-dev dbus-glib-dev bluez-dev expat-dev \ 56.26 -libgphoto2-dev libmtp-dev gtk+3-dev glibc-dev sqlite-dev libtool" 56.27 +#BUILD_DEPENDS+"samba-dev smbclient expat-dev dbus-glib-dev bluez-dev" 56.28 +BUILD_DEPENDS="libxslt libgio-dev gtk-doc glib-dev dbus-dev gcr-dev intltool \ 56.29 +libgphoto2-dev libarchive-dev libsoup-dev libcdio-dev libmtp-dev fuse-dev \ 56.30 +udisks2-dev gtk+3-dev" 56.31 +SPLIT="gvfs-afp gvfs-archive gvfs-cdda gvfs-fuse gvfs-gphoto2 gvfs-gtk \ 56.32 +gvfs-http gvfs-libmtp gvfs-obexftp gvfs-smb gvfs-udisks2 gvfs-dev" 56.33 56.34 # Rules to configure and make the package. 56.35 compile_rules() 56.36 { 56.37 - patch -p0 -i $stuff/allow-dropbear-ssh.patch 56.38 +# TODO 56.39 +# patch -p0 -i $stuff/allow-dropbear-ssh.patch 56.40 56.41 ./configure \ 56.42 - --prefix=/usr \ 56.43 - --libexecdir=/usr/lib/$PACKAGE \ 56.44 --sysconfdir=/etc \ 56.45 - --disable-documentation \ 56.46 - --disable-bash-completion \ 56.47 + --enable-gtk-doc \ 56.48 + --disable-libsystemd-login \ 56.49 + --with-systemduserunitdir=no \ 56.50 $CONFIGURE_ARGS && \ 56.51 make && make install 56.52 }
57.1 --- a/gvfs/stuff/list Sat Apr 15 16:06:43 2017 +0300 57.2 +++ b/gvfs/stuff/list Fri Apr 21 14:48:05 2017 +0300 57.3 @@ -25,41 +25,41 @@ 57.4 gvfs-dev: /usr/lib/gio/modules/libgvfsdbus.la 57.5 gvfs: /usr/lib/gio/modules/libgvfsdbus.so 57.6 57.7 -gvfs: /usr/lib/gvfs/gvfsd 57.8 -gvfs-afp: /usr/lib/gvfs/gvfsd-afp 57.9 -gvfs-afp: /usr/lib/gvfs/gvfsd-afp-browse 57.10 -gvfs-archive: /usr/lib/gvfs/gvfsd-archive 57.11 -gvfs: /usr/lib/gvfs/gvfsd-burn 57.12 -gvfs-cdda: /usr/lib/gvfs/gvfsd-cdda 57.13 -gvfs: /usr/lib/gvfs/gvfsd-computer 57.14 -gvfs-http: /usr/lib/gvfs/gvfsd-dav 57.15 -gvfs: /usr/lib/gvfs/gvfsd-ftp 57.16 -gvfs-fuse: /usr/lib/gvfs/gvfsd-fuse 57.17 -gvfs-gphoto2: /usr/lib/gvfs/gvfsd-gphoto2 57.18 -gvfs-http: /usr/lib/gvfs/gvfsd-http 57.19 -gvfs: /usr/lib/gvfs/gvfsd-localtest 57.20 -gvfs: /usr/lib/gvfs/gvfsd-metadata 57.21 -gvfs-libmtp: /usr/lib/gvfs/gvfsd-mtp 57.22 -gvfs: /usr/lib/gvfs/gvfsd-network 57.23 -gvfs-obexftp: /usr/lib/gvfs/gvfsd-obexftp 57.24 -gvfs-gtk: /usr/lib/gvfs/gvfsd-recent 57.25 -gvfs: /usr/lib/gvfs/gvfsd-sftp 57.26 -gvfs-smb: /usr/lib/gvfs/gvfsd-smb 57.27 -gvfs-smb: /usr/lib/gvfs/gvfsd-smb-browse 57.28 -gvfs: /usr/lib/gvfs/gvfsd-trash 57.29 -gvfs-gphoto2: /usr/lib/gvfs/gvfs-gphoto2-volume-monitor 57.30 -gvfs-libmtp: /usr/lib/gvfs/gvfs-mtp-volume-monitor 57.31 -gvfs-udisks2: /usr/lib/gvfs/gvfs-udisks2-volume-monitor 57.32 +gvfs: /usr/libexec/gvfsd 57.33 +gvfs-afp: /usr/libexec/gvfsd-afp 57.34 +gvfs-afp: /usr/libexec/gvfsd-afp-browse 57.35 +gvfs-archive: /usr/libexec/gvfsd-archive 57.36 +gvfs: /usr/libexec/gvfsd-burn 57.37 +gvfs-cdda: /usr/libexec/gvfsd-cdda 57.38 +gvfs: /usr/libexec/gvfsd-computer 57.39 +gvfs-http: /usr/libexec/gvfsd-dav 57.40 +gvfs: /usr/libexec/gvfsd-ftp 57.41 +gvfs-fuse: /usr/libexec/gvfsd-fuse 57.42 +gvfs-gphoto2: /usr/libexec/gvfsd-gphoto2 57.43 +gvfs-http: /usr/libexec/gvfsd-http 57.44 +gvfs: /usr/libexec/gvfsd-localtest 57.45 +gvfs: /usr/libexec/gvfsd-metadata 57.46 +gvfs-libmtp: /usr/libexec/gvfsd-mtp 57.47 +gvfs: /usr/libexec/gvfsd-network 57.48 +gvfs-obexftp: /usr/libexec/gvfsd-obexftp 57.49 +gvfs-gtk: /usr/libexec/gvfsd-recent 57.50 +gvfs: /usr/libexec/gvfsd-sftp 57.51 +gvfs-smb: /usr/libexec/gvfsd-smb 57.52 +gvfs-smb: /usr/libexec/gvfsd-smb-browse 57.53 +gvfs: /usr/libexec/gvfsd-trash 57.54 +gvfs-gphoto2: /usr/libexec/gvfs-gphoto2-volume-monitor 57.55 +gvfs-libmtp: /usr/libexec/gvfs-mtp-volume-monitor 57.56 +gvfs-udisks2: /usr/libexec/gvfs-udisks2-volume-monitor 57.57 gvfs-dev: /usr/lib/gvfs/libgvfscommon.la 57.58 gvfs: /usr/lib/gvfs/libgvfscommon.so 57.59 gvfs-dev: /usr/lib/gvfs/libgvfsdaemon.la 57.60 gvfs: /usr/lib/gvfs/libgvfsdaemon.so 57.61 57.62 -gvfs: /usr/share/dbus-1/services/gvfs-daemon.service 57.63 -gvfs: /usr/share/dbus-1/services/gvfs-metadata.service 57.64 -gvfs-gphoto2: /usr/share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service 57.65 -gvfs-libmtp: /usr/share/dbus-1/services/org.gtk.Private.MTPVolumeMonitor.service 57.66 -gvfs-udisks2: /usr/share/dbus-1/services/org.gtk.Private.UDisks2VolumeMonitor.service 57.67 +gvfs: /usr/share/dbus-1/services/org.gtk.vfs.Daemon.service 57.68 +gvfs: /usr/share/dbus-1/services/org.gtk.vfs.Metadata.service 57.69 +gvfs-gphoto2: /usr/share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service 57.70 +gvfs-libmtp: /usr/share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service 57.71 +gvfs-udisks2: /usr/share/dbus-1/services/org.gtk.vfs.UDisks2VolumeMonitor.service 57.72 57.73 gvfs-smb: /usr/share/GConf/gsettings/gvfs-smb.convert 57.74
58.1 --- a/gvfs/stuff/split Sat Apr 15 16:06:43 2017 +0300 58.2 +++ b/gvfs/stuff/split Fri Apr 21 14:48:05 2017 +0300 58.3 @@ -7,7 +7,14 @@ 58.4 58.5 echo 'Files not belongs any gvfs* package:' 58.6 for file in $(find $install -type f | sed "s|$install||g" | sort); do 58.7 - [ -z "$(grep $file $WOK/gvfs/stuff/list)" ] && echo " $file" 58.8 + case $file in 58.9 + /usr/share/bash-completion/*) ;; 58.10 + /usr/share/locale/*) ;; 58.11 + /usr/share/man/*) ;; 58.12 + *) 58.13 + [ -z "$(grep $file $WOK/gvfs/stuff/list)" ] && echo " $file" 58.14 + ;; 58.15 + esac 58.16 done 58.17 58.18 echo 'Absent files:'
59.1 --- a/jasper-dev/receipt Sat Apr 15 16:06:43 2017 +0300 59.2 +++ b/jasper-dev/receipt Fri Apr 21 14:48:05 2017 +0300 59.3 @@ -3,20 +3,17 @@ 59.4 PACKAGE="jasper-dev" 59.5 VERSION="1.900.1" 59.6 CATEGORY="development" 59.7 -SHORT_DESC="jasper devel files" 59.8 +SHORT_DESC="Implementation of JPEG-2000 codec (development files)" 59.9 MAINTAINER="jozee@slitaz.org" 59.10 LICENSE="MIT" 59.11 -WANTED="jasper" 59.12 WEB_SITE="http://www.ece.uvic.ca/~mdadams/jasper/" 59.13 HOST_ARCH="i486 arm" 59.14 59.15 +WANTED="jasper" 59.16 DEPENDS="jasper" 59.17 59.18 # Rules to gen a SliTaz package suitable for Tazpkg. 59.19 genpkg_rules() 59.20 { 59.21 - mkdir -p $fs/usr/lib 59.22 - cp -a $install/usr/lib/*.*a $fs/usr/lib 59.23 - #cp -a $install/usr/lib/pkgconfig $fs/usr/lib 59.24 - cp -a $install/usr/include $fs/usr 59.25 + cook_copy_files *.h *.la 59.26 }
60.1 --- a/jasper/receipt Sat Apr 15 16:06:43 2017 +0300 60.2 +++ b/jasper/receipt Fri Apr 21 14:48:05 2017 +0300 60.3 @@ -3,34 +3,38 @@ 60.4 PACKAGE="jasper" 60.5 VERSION="1.900.1" 60.6 CATEGORY="graphics" 60.7 -SHORT_DESC="implementation of JPEG-2000 codec" 60.8 +SHORT_DESC="Implementation of JPEG-2000 codec" 60.9 MAINTAINER="jozee@slitaz.org" 60.10 LICENSE="MIT" 60.11 -TARBALL="$PACKAGE-$VERSION.zip" 60.12 -WEB_SITE="http://www.ece.uvic.ca/~mdadams/$PACKAGE/" 60.13 -WGET_URL="$WEB_SITE/software/$TARBALL" 60.14 +WEB_SITE="http://www.ece.uvic.ca/~mdadams/jasper/" 60.15 TAGS="jpeg jpg photo" 60.16 HOST_ARCH="i486 arm" 60.17 60.18 -DEPENDS="xorg-libXi xorg-libXmu jpeg freeglut libglu-mesa util-linux-uuid" 60.19 -BUILD_DEPENDS="jpeg-dev xorg-libXi-dev xorg-libXmu-dev autoconf" 60.20 +TARBALL="$PACKAGE-$VERSION.zip" 60.21 +WGET_URL="${WEB_SITE}software/$TARBALL" 60.22 + 60.23 +DEPENDS="" 60.24 +BUILD_DEPENDS="gfortran xorg-libX11-dev" 60.25 60.26 # Rules to configure and make the package. 60.27 compile_rules() 60.28 { 60.29 - cd $src 60.30 - chmod +x configure 60.31 - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared $CONFIGURE_ARGS && 60.32 - make && 60.33 - make DESTDIR=$DESTDIR install 60.34 - 60.35 + while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series 60.36 + 60.37 + ./configure \ 60.38 + --enable-shared \ 60.39 + --disable-static \ 60.40 + --mandir=/usr/share/man \ 60.41 + $CONFIGURE_ARGS && 60.42 + make && make install && 60.43 + 60.44 + install -v -m755 -d $install/usr/share/doc/jasper-$VERSION && 60.45 + install -v -m644 doc/*.pdf $install/usr/share/doc/jasper-$VERSION 60.46 } 60.47 60.48 # Rules to gen a SliTaz package suitable for Tazpkg. 60.49 genpkg_rules() 60.50 { 60.51 - mkdir -p $fs/usr/lib 60.52 - cp -a $install/usr/bin $fs/usr 60.53 - cp -a $install/usr/lib/*so* $fs/usr/lib 60.54 - 60.55 + cook_copy_folders bin 60.56 + cook_copy_files *.so* 60.57 }
61.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 61.2 +++ b/jasper/stuff/patches/jasper-1.900.1-security_fixes-2.patch Fri Apr 21 14:48:05 2017 +0300 61.3 @@ -0,0 +1,1302 @@ 61.4 +Submitted By: Armin K. <krejzi at email dot com> 61.5 +Date: 2015-01-28 61.6 +Initial Package Version: 1.900.1 61.7 +Upstream Status: Unknown 61.8 +Origin: Archlinux 61.9 +Description: Fixes multiple security issues, including: 61.10 + CVE-2008-3520, CVE-2008-3522, CVE-2011-4516, CVE-2011-4517, 61.11 + CVE-2014-8137, CVE-2014-8138, CVE-2014-8157, CVE-2014-8158 and 61.12 + CVE-2014-9029. Filename buffer overflow and Stepsizes overflow. 61.13 + 61.14 +--- a/src/libjasper/base/jas_cm.c 2007-01-19 22:43:05.000000000 +0100 61.15 ++++ b/src/libjasper/base/jas_cm.c 2015-01-28 17:57:34.114045370 +0100 61.16 +@@ -704,8 +704,7 @@ 61.17 + { 61.18 + jas_cmpxform_t **p; 61.19 + assert(n >= pxformseq->numpxforms); 61.20 +- p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) : 61.21 +- jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *)); 61.22 ++ p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *)); 61.23 + if (!p) { 61.24 + return -1; 61.25 + } 61.26 +@@ -889,13 +888,13 @@ 61.27 + jas_cmshapmatlut_cleanup(lut); 61.28 + if (curv->numents == 0) { 61.29 + lut->size = 2; 61.30 +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) 61.31 ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) 61.32 + goto error; 61.33 + lut->data[0] = 0.0; 61.34 + lut->data[1] = 1.0; 61.35 + } else if (curv->numents == 1) { 61.36 + lut->size = 256; 61.37 +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) 61.38 ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) 61.39 + goto error; 61.40 + gamma = curv->ents[0] / 256.0; 61.41 + for (i = 0; i < lut->size; ++i) { 61.42 +@@ -903,7 +902,7 @@ 61.43 + } 61.44 + } else { 61.45 + lut->size = curv->numents; 61.46 +- if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t)))) 61.47 ++ if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t)))) 61.48 + goto error; 61.49 + for (i = 0; i < lut->size; ++i) { 61.50 + lut->data[i] = curv->ents[i] / 65535.0; 61.51 +@@ -953,7 +952,7 @@ 61.52 + return -1; 61.53 + } 61.54 + } 61.55 +- if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t)))) 61.56 ++ if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t)))) 61.57 + return -1; 61.58 + invlut->size = n; 61.59 + for (i = 0; i < invlut->size; ++i) { 61.60 +--- a/src/libjasper/base/jas_icc.c 2007-01-19 22:43:05.000000000 +0100 61.61 ++++ b/src/libjasper/base/jas_icc.c 2015-01-28 17:58:32.874025377 +0100 61.62 +@@ -373,7 +373,7 @@ 61.63 + jas_icctagtab_t *tagtab; 61.64 + 61.65 + tagtab = &prof->tagtab; 61.66 +- if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs * 61.67 ++ if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs, 61.68 + sizeof(jas_icctagtabent_t)))) 61.69 + goto error; 61.70 + tagtab->numents = prof->attrtab->numattrs; 61.71 +@@ -522,7 +522,7 @@ 61.72 + } 61.73 + if (jas_iccgetuint32(in, &tagtab->numents)) 61.74 + goto error; 61.75 +- if (!(tagtab->ents = jas_malloc(tagtab->numents * 61.76 ++ if (!(tagtab->ents = jas_alloc2(tagtab->numents, 61.77 + sizeof(jas_icctagtabent_t)))) 61.78 + goto error; 61.79 + tagtabent = tagtab->ents; 61.80 +@@ -743,8 +743,7 @@ 61.81 + { 61.82 + jas_iccattr_t *newattrs; 61.83 + assert(maxents >= tab->numattrs); 61.84 +- newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents * 61.85 +- sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t)); 61.86 ++ newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t)); 61.87 + if (!newattrs) 61.88 + return -1; 61.89 + tab->attrs = newattrs; 61.90 +@@ -999,7 +998,7 @@ 61.91 + 61.92 + if (jas_iccgetuint32(in, &curv->numents)) 61.93 + goto error; 61.94 +- if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t)))) 61.95 ++ if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t)))) 61.96 + goto error; 61.97 + for (i = 0; i < curv->numents; ++i) { 61.98 + if (jas_iccgetuint16(in, &curv->ents[i])) 61.99 +@@ -1011,7 +1010,6 @@ 61.100 + return 0; 61.101 + 61.102 + error: 61.103 +- jas_icccurv_destroy(attrval); 61.104 + return -1; 61.105 + } 61.106 + 61.107 +@@ -1100,7 +1098,7 @@ 61.108 + if (jas_iccgetuint32(in, &txtdesc->uclangcode) || 61.109 + jas_iccgetuint32(in, &txtdesc->uclen)) 61.110 + goto error; 61.111 +- if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2))) 61.112 ++ if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2))) 61.113 + goto error; 61.114 + if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) != 61.115 + JAS_CAST(int, txtdesc->uclen * 2)) 61.116 +@@ -1129,7 +1127,6 @@ 61.117 + #endif 61.118 + return 0; 61.119 + error: 61.120 +- jas_icctxtdesc_destroy(attrval); 61.121 + return -1; 61.122 + } 61.123 + 61.124 +@@ -1208,8 +1205,6 @@ 61.125 + goto error; 61.126 + return 0; 61.127 + error: 61.128 +- if (txt->string) 61.129 +- jas_free(txt->string); 61.130 + return -1; 61.131 + } 61.132 + 61.133 +@@ -1292,17 +1287,17 @@ 61.134 + jas_iccgetuint16(in, &lut8->numouttabents)) 61.135 + goto error; 61.136 + clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans; 61.137 +- if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) || 61.138 +- !(lut8->intabsbuf = jas_malloc(lut8->numinchans * 61.139 +- lut8->numintabents * sizeof(jas_iccuint8_t))) || 61.140 +- !(lut8->intabs = jas_malloc(lut8->numinchans * 61.141 ++ if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) || 61.142 ++ !(lut8->intabsbuf = jas_alloc3(lut8->numinchans, 61.143 ++ lut8->numintabents, sizeof(jas_iccuint8_t))) || 61.144 ++ !(lut8->intabs = jas_alloc2(lut8->numinchans, 61.145 + sizeof(jas_iccuint8_t *)))) 61.146 + goto error; 61.147 + for (i = 0; i < lut8->numinchans; ++i) 61.148 + lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents]; 61.149 +- if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans * 61.150 +- lut8->numouttabents * sizeof(jas_iccuint8_t))) || 61.151 +- !(lut8->outtabs = jas_malloc(lut8->numoutchans * 61.152 ++ if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans, 61.153 ++ lut8->numouttabents, sizeof(jas_iccuint8_t))) || 61.154 ++ !(lut8->outtabs = jas_alloc2(lut8->numoutchans, 61.155 + sizeof(jas_iccuint8_t *)))) 61.156 + goto error; 61.157 + for (i = 0; i < lut8->numoutchans; ++i) 61.158 +@@ -1330,7 +1325,6 @@ 61.159 + goto error; 61.160 + return 0; 61.161 + error: 61.162 +- jas_icclut8_destroy(attrval); 61.163 + return -1; 61.164 + } 61.165 + 61.166 +@@ -1461,17 +1455,17 @@ 61.167 + jas_iccgetuint16(in, &lut16->numouttabents)) 61.168 + goto error; 61.169 + clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans; 61.170 +- if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) || 61.171 +- !(lut16->intabsbuf = jas_malloc(lut16->numinchans * 61.172 +- lut16->numintabents * sizeof(jas_iccuint16_t))) || 61.173 +- !(lut16->intabs = jas_malloc(lut16->numinchans * 61.174 ++ if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) || 61.175 ++ !(lut16->intabsbuf = jas_alloc3(lut16->numinchans, 61.176 ++ lut16->numintabents, sizeof(jas_iccuint16_t))) || 61.177 ++ !(lut16->intabs = jas_alloc2(lut16->numinchans, 61.178 + sizeof(jas_iccuint16_t *)))) 61.179 + goto error; 61.180 + for (i = 0; i < lut16->numinchans; ++i) 61.181 + lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents]; 61.182 +- if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans * 61.183 +- lut16->numouttabents * sizeof(jas_iccuint16_t))) || 61.184 +- !(lut16->outtabs = jas_malloc(lut16->numoutchans * 61.185 ++ if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans, 61.186 ++ lut16->numouttabents, sizeof(jas_iccuint16_t))) || 61.187 ++ !(lut16->outtabs = jas_alloc2(lut16->numoutchans, 61.188 + sizeof(jas_iccuint16_t *)))) 61.189 + goto error; 61.190 + for (i = 0; i < lut16->numoutchans; ++i) 61.191 +@@ -1499,7 +1493,6 @@ 61.192 + goto error; 61.193 + return 0; 61.194 + error: 61.195 +- jas_icclut16_destroy(attrval); 61.196 + return -1; 61.197 + } 61.198 + 61.199 +--- a/src/libjasper/base/jas_image.c 2007-01-19 22:43:05.000000000 +0100 61.200 ++++ b/src/libjasper/base/jas_image.c 2015-01-28 17:57:34.116045403 +0100 61.201 +@@ -142,7 +142,7 @@ 61.202 + image->inmem_ = true; 61.203 + 61.204 + /* Allocate memory for the per-component information. */ 61.205 +- if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ * 61.206 ++ if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_, 61.207 + sizeof(jas_image_cmpt_t *)))) { 61.208 + jas_image_destroy(image); 61.209 + return 0; 61.210 +@@ -774,8 +774,7 @@ 61.211 + jas_image_cmpt_t **newcmpts; 61.212 + int cmptno; 61.213 + 61.214 +- newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) : 61.215 +- jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *)); 61.216 ++ newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *)); 61.217 + if (!newcmpts) { 61.218 + return -1; 61.219 + } 61.220 +--- a/src/libjasper/base/jas_malloc.c 2007-01-19 22:43:05.000000000 +0100 61.221 ++++ b/src/libjasper/base/jas_malloc.c 2015-01-28 17:57:34.116045403 +0100 61.222 +@@ -76,6 +76,9 @@ 61.223 + 61.224 + /* We need the prototype for memset. */ 61.225 + #include <string.h> 61.226 ++#include <limits.h> 61.227 ++#include <errno.h> 61.228 ++#include <stdint.h> 61.229 + 61.230 + #include "jasper/jas_malloc.h" 61.231 + 61.232 +@@ -113,18 +116,50 @@ 61.233 + 61.234 + void *jas_realloc(void *ptr, size_t size) 61.235 + { 61.236 +- return realloc(ptr, size); 61.237 ++ return ptr ? realloc(ptr, size) : malloc(size); 61.238 + } 61.239 + 61.240 +-void *jas_calloc(size_t nmemb, size_t size) 61.241 ++void *jas_realloc2(void *ptr, size_t nmemb, size_t size) 61.242 ++{ 61.243 ++ if (!ptr) 61.244 ++ return jas_alloc2(nmemb, size); 61.245 ++ if (nmemb && SIZE_MAX / nmemb < size) { 61.246 ++ errno = ENOMEM; 61.247 ++ return NULL; 61.248 ++ } 61.249 ++ return jas_realloc(ptr, nmemb * size); 61.250 ++ 61.251 ++} 61.252 ++ 61.253 ++void *jas_alloc2(size_t nmemb, size_t size) 61.254 ++{ 61.255 ++ if (nmemb && SIZE_MAX / nmemb < size) { 61.256 ++ errno = ENOMEM; 61.257 ++ return NULL; 61.258 ++ } 61.259 ++ 61.260 ++ return jas_malloc(nmemb * size); 61.261 ++} 61.262 ++ 61.263 ++void *jas_alloc3(size_t a, size_t b, size_t c) 61.264 + { 61.265 +- void *ptr; 61.266 + size_t n; 61.267 +- n = nmemb * size; 61.268 +- if (!(ptr = jas_malloc(n * sizeof(char)))) { 61.269 +- return 0; 61.270 ++ 61.271 ++ if (a && SIZE_MAX / a < b) { 61.272 ++ errno = ENOMEM; 61.273 ++ return NULL; 61.274 + } 61.275 +- memset(ptr, 0, n); 61.276 ++ 61.277 ++ return jas_alloc2(a*b, c); 61.278 ++} 61.279 ++ 61.280 ++void *jas_calloc(size_t nmemb, size_t size) 61.281 ++{ 61.282 ++ void *ptr; 61.283 ++ 61.284 ++ ptr = jas_alloc2(nmemb, size); 61.285 ++ if (ptr) 61.286 ++ memset(ptr, 0, nmemb*size); 61.287 + return ptr; 61.288 + } 61.289 + 61.290 +--- a/src/libjasper/base/jas_seq.c 2007-01-19 22:43:05.000000000 +0100 61.291 ++++ b/src/libjasper/base/jas_seq.c 2015-01-28 17:57:34.116045403 +0100 61.292 +@@ -114,7 +114,7 @@ 61.293 + matrix->datasize_ = numrows * numcols; 61.294 + 61.295 + if (matrix->maxrows_ > 0) { 61.296 +- if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ * 61.297 ++ if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_, 61.298 + sizeof(jas_seqent_t *)))) { 61.299 + jas_matrix_destroy(matrix); 61.300 + return 0; 61.301 +@@ -122,7 +122,7 @@ 61.302 + } 61.303 + 61.304 + if (matrix->datasize_ > 0) { 61.305 +- if (!(matrix->data_ = jas_malloc(matrix->datasize_ * 61.306 ++ if (!(matrix->data_ = jas_alloc2(matrix->datasize_, 61.307 + sizeof(jas_seqent_t)))) { 61.308 + jas_matrix_destroy(matrix); 61.309 + return 0; 61.310 +@@ -220,7 +220,7 @@ 61.311 + mat0->numrows_ = r1 - r0 + 1; 61.312 + mat0->numcols_ = c1 - c0 + 1; 61.313 + mat0->maxrows_ = mat0->numrows_; 61.314 +- mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *)); 61.315 ++ mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *)); 61.316 + for (i = 0; i < mat0->numrows_; ++i) { 61.317 + mat0->rows_[i] = mat1->rows_[r0 + i] + c0; 61.318 + } 61.319 +--- a/src/libjasper/base/jas_stream.c 2007-01-19 22:43:05.000000000 +0100 61.320 ++++ b/src/libjasper/base/jas_stream.c 2015-01-28 17:57:57.483434550 +0100 61.321 +@@ -212,7 +212,7 @@ 61.322 + if (buf) { 61.323 + obj->buf_ = (unsigned char *) buf; 61.324 + } else { 61.325 +- obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char)); 61.326 ++ obj->buf_ = jas_malloc(obj->bufsize_); 61.327 + obj->myalloc_ = 1; 61.328 + } 61.329 + if (!obj->buf_) { 61.330 +@@ -553,7 +553,7 @@ 61.331 + int ret; 61.332 + 61.333 + va_start(ap, fmt); 61.334 +- ret = vsprintf(buf, fmt, ap); 61.335 ++ ret = vsnprintf(buf, sizeof buf, fmt, ap); 61.336 + jas_stream_puts(stream, buf); 61.337 + va_end(ap); 61.338 + return ret; 61.339 +@@ -992,7 +992,7 @@ 61.340 + unsigned char *buf; 61.341 + 61.342 + assert(m->buf_); 61.343 +- if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) { 61.344 ++ if (!(buf = jas_realloc(m->buf_, bufsize))) { 61.345 + return -1; 61.346 + } 61.347 + m->buf_ = buf; 61.348 +--- a/src/libjasper/bmp/bmp_dec.c 2007-01-19 22:43:07.000000000 +0100 61.349 ++++ b/src/libjasper/bmp/bmp_dec.c 2015-01-28 17:57:34.117045420 +0100 61.350 +@@ -283,7 +283,7 @@ 61.351 + } 61.352 + 61.353 + if (info->numcolors > 0) { 61.354 +- if (!(info->palents = jas_malloc(info->numcolors * 61.355 ++ if (!(info->palents = jas_alloc2(info->numcolors, 61.356 + sizeof(bmp_palent_t)))) { 61.357 + bmp_info_destroy(info); 61.358 + return 0; 61.359 +--- a/src/libjasper/include/jasper/jas_malloc.h 2007-01-19 22:43:04.000000000 +0100 61.360 ++++ b/src/libjasper/include/jasper/jas_malloc.h 2015-01-28 17:57:34.118045437 +0100 61.361 +@@ -95,6 +95,9 @@ 61.362 + #define jas_free MEMFREE 61.363 + #define jas_realloc MEMREALLOC 61.364 + #define jas_calloc MEMCALLOC 61.365 ++#define jas_alloc2(a, b) MEMALLOC((a)*(b)) 61.366 ++#define jas_alloc3(a, b, c) MEMALLOC((a)*(b)*(c)) 61.367 ++#define jas_realloc2(p, a, b) MEMREALLOC((p), (a)*(b)) 61.368 + #endif 61.369 + 61.370 + /******************************************************************************\ 61.371 +@@ -115,6 +118,12 @@ 61.372 + /* Allocate a block of memory and initialize the contents to zero. */ 61.373 + void *jas_calloc(size_t nmemb, size_t size); 61.374 + 61.375 ++/* size-checked double allocation .*/ 61.376 ++void *jas_alloc2(size_t, size_t); 61.377 ++ 61.378 ++void *jas_alloc3(size_t, size_t, size_t); 61.379 ++ 61.380 ++void *jas_realloc2(void *, size_t, size_t); 61.381 + #endif 61.382 + 61.383 + #ifdef __cplusplus 61.384 +--- a/src/libjasper/jp2/jp2_cod.c 2007-01-19 22:43:05.000000000 +0100 61.385 ++++ b/src/libjasper/jp2/jp2_cod.c 2015-01-28 17:57:34.118045437 +0100 61.386 +@@ -247,7 +247,7 @@ 61.387 + box = 0; 61.388 + tmpstream = 0; 61.389 + 61.390 +- if (!(box = jas_malloc(sizeof(jp2_box_t)))) { 61.391 ++ if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) { 61.392 + goto error; 61.393 + } 61.394 + box->ops = &jp2_boxinfo_unk.ops; 61.395 +@@ -372,7 +372,7 @@ 61.396 + jp2_bpcc_t *bpcc = &box->data.bpcc; 61.397 + unsigned int i; 61.398 + bpcc->numcmpts = box->datalen; 61.399 +- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) { 61.400 ++ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) { 61.401 + return -1; 61.402 + } 61.403 + for (i = 0; i < bpcc->numcmpts; ++i) { 61.404 +@@ -416,7 +416,7 @@ 61.405 + break; 61.406 + case JP2_COLR_ICC: 61.407 + colr->iccplen = box->datalen - 3; 61.408 +- if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) { 61.409 ++ if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) { 61.410 + return -1; 61.411 + } 61.412 + if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) { 61.413 +@@ -453,7 +453,7 @@ 61.414 + if (jp2_getuint16(in, &cdef->numchans)) { 61.415 + return -1; 61.416 + } 61.417 +- if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) { 61.418 ++ if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) { 61.419 + return -1; 61.420 + } 61.421 + for (channo = 0; channo < cdef->numchans; ++channo) { 61.422 +@@ -766,7 +766,7 @@ 61.423 + unsigned int i; 61.424 + 61.425 + cmap->numchans = (box->datalen) / 4; 61.426 +- if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) { 61.427 ++ if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) { 61.428 + return -1; 61.429 + } 61.430 + for (i = 0; i < cmap->numchans; ++i) { 61.431 +@@ -828,10 +828,10 @@ 61.432 + return -1; 61.433 + } 61.434 + lutsize = pclr->numlutents * pclr->numchans; 61.435 +- if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) { 61.436 ++ if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) { 61.437 + return -1; 61.438 + } 61.439 +- if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) { 61.440 ++ if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) { 61.441 + return -1; 61.442 + } 61.443 + for (i = 0; i < pclr->numchans; ++i) { 61.444 +--- a/src/libjasper/jp2/jp2_dec.c 2007-01-19 22:43:05.000000000 +0100 61.445 ++++ b/src/libjasper/jp2/jp2_dec.c 2015-01-28 18:01:07.082617636 +0100 61.446 +@@ -291,7 +291,10 @@ 61.447 + case JP2_COLR_ICC: 61.448 + iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp, 61.449 + dec->colr->data.colr.iccplen); 61.450 +- assert(iccprof); 61.451 ++ if (!iccprof) { 61.452 ++ jas_eprintf("error: failed to parse ICC profile\n"); 61.453 ++ goto error; 61.454 ++ } 61.455 + jas_iccprof_gethdr(iccprof, &icchdr); 61.456 + jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); 61.457 + jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); 61.458 +@@ -336,7 +339,7 @@ 61.459 + } 61.460 + 61.461 + /* Allocate space for the channel-number to component-number LUT. */ 61.462 +- if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) { 61.463 ++ if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) { 61.464 + jas_eprintf("error: no memory\n"); 61.465 + goto error; 61.466 + } 61.467 +@@ -354,7 +357,7 @@ 61.468 + if (cmapent->map == JP2_CMAP_DIRECT) { 61.469 + dec->chantocmptlut[channo] = channo; 61.470 + } else if (cmapent->map == JP2_CMAP_PALETTE) { 61.471 +- lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t)); 61.472 ++ lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t)); 61.473 + for (i = 0; i < pclrd->numlutents; ++i) { 61.474 + lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans]; 61.475 + } 61.476 +@@ -386,6 +389,11 @@ 61.477 + /* Determine the type of each component. */ 61.478 + if (dec->cdef) { 61.479 + for (i = 0; i < dec->numchans; ++i) { 61.480 ++ /* Is the channel number reasonable? */ 61.481 ++ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) { 61.482 ++ jas_eprintf("error: invalid channel number in CDEF box\n"); 61.483 ++ goto error; 61.484 ++ } 61.485 + jas_image_setcmpttype(dec->image, 61.486 + dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo], 61.487 + jp2_getct(jas_image_clrspc(dec->image), 61.488 +--- a/src/libjasper/jp2/jp2_enc.c 2007-01-19 22:43:05.000000000 +0100 61.489 ++++ b/src/libjasper/jp2/jp2_enc.c 2015-01-28 17:57:34.119045453 +0100 61.490 +@@ -191,7 +191,7 @@ 61.491 + } 61.492 + bpcc = &box->data.bpcc; 61.493 + bpcc->numcmpts = jas_image_numcmpts(image); 61.494 +- if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * 61.495 ++ if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, 61.496 + sizeof(uint_fast8_t)))) { 61.497 + goto error; 61.498 + } 61.499 +@@ -285,7 +285,7 @@ 61.500 + } 61.501 + cdef = &box->data.cdef; 61.502 + cdef->numchans = jas_image_numcmpts(image); 61.503 +- cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)); 61.504 ++ cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)); 61.505 + for (i = 0; i < jas_image_numcmpts(image); ++i) { 61.506 + cdefchanent = &cdef->ents[i]; 61.507 + cdefchanent->channo = i; 61.508 +--- a/src/libjasper/jpc/jpc_cs.c 2007-01-19 22:43:07.000000000 +0100 61.509 ++++ b/src/libjasper/jpc/jpc_cs.c 2015-01-28 17:57:34.120045470 +0100 61.510 +@@ -502,7 +502,7 @@ 61.511 + !siz->tileheight || !siz->numcomps) { 61.512 + return -1; 61.513 + } 61.514 +- if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) { 61.515 ++ if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) { 61.516 + return -1; 61.517 + } 61.518 + for (i = 0; i < siz->numcomps; ++i) { 61.519 +@@ -982,8 +982,11 @@ 61.520 + compparms->numstepsizes = (len - n) / 2; 61.521 + break; 61.522 + } 61.523 +- if (compparms->numstepsizes > 0) { 61.524 +- compparms->stepsizes = jas_malloc(compparms->numstepsizes * 61.525 ++ if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) { 61.526 ++ jpc_qcx_destroycompparms(compparms); 61.527 ++ return -1; 61.528 ++ } else if (compparms->numstepsizes > 0) { 61.529 ++ compparms->stepsizes = jas_alloc2(compparms->numstepsizes, 61.530 + sizeof(uint_fast16_t)); 61.531 + assert(compparms->stepsizes); 61.532 + for (i = 0; i < compparms->numstepsizes; ++i) { 61.533 +@@ -1091,7 +1094,7 @@ 61.534 + 61.535 + ppm->len = ms->len - 1; 61.536 + if (ppm->len > 0) { 61.537 +- if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) { 61.538 ++ if (!(ppm->data = jas_malloc(ppm->len))) { 61.539 + goto error; 61.540 + } 61.541 + if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) { 61.542 +@@ -1160,7 +1163,7 @@ 61.543 + } 61.544 + ppt->len = ms->len - 1; 61.545 + if (ppt->len > 0) { 61.546 +- if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) { 61.547 ++ if (!(ppt->data = jas_malloc(ppt->len))) { 61.548 + goto error; 61.549 + } 61.550 + if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) { 61.551 +@@ -1223,7 +1226,7 @@ 61.552 + uint_fast8_t tmp; 61.553 + poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) : 61.554 + (ms->len / 7); 61.555 +- if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) { 61.556 ++ if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) { 61.557 + goto error; 61.558 + } 61.559 + for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno, 61.560 +@@ -1328,7 +1331,7 @@ 61.561 + jpc_crgcomp_t *comp; 61.562 + uint_fast16_t compno; 61.563 + crg->numcomps = cstate->numcomps; 61.564 +- if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) { 61.565 ++ if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) { 61.566 + return -1; 61.567 + } 61.568 + for (compno = 0, comp = crg->comps; compno < cstate->numcomps; 61.569 +@@ -1467,7 +1470,7 @@ 61.570 + cstate = 0; 61.571 + 61.572 + if (ms->len > 0) { 61.573 +- if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) { 61.574 ++ if (!(unk->data = jas_malloc(ms->len))) { 61.575 + return -1; 61.576 + } 61.577 + if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) { 61.578 +--- a/src/libjasper/jpc/jpc_dec.c 2007-01-19 22:43:07.000000000 +0100 61.579 ++++ b/src/libjasper/jpc/jpc_dec.c 2015-01-28 17:59:44.748230228 +0100 61.580 +@@ -449,7 +449,7 @@ 61.581 + 61.582 + if (dec->state == JPC_MH) { 61.583 + 61.584 +- compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t)); 61.585 ++ compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t)); 61.586 + assert(compinfos); 61.587 + for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos; 61.588 + cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) { 61.589 +@@ -489,7 +489,7 @@ 61.590 + dec->curtileendoff = 0; 61.591 + } 61.592 + 61.593 +- if (JAS_CAST(int, sot->tileno) > dec->numtiles) { 61.594 ++ if (JAS_CAST(int, sot->tileno) >= dec->numtiles) { 61.595 + jas_eprintf("invalid tile number in SOT marker segment\n"); 61.596 + return -1; 61.597 + } 61.598 +@@ -692,7 +692,7 @@ 61.599 + tile->realmode = 1; 61.600 + } 61.601 + tcomp->numrlvls = ccp->numrlvls; 61.602 +- if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls * 61.603 ++ if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls, 61.604 + sizeof(jpc_dec_rlvl_t)))) { 61.605 + return -1; 61.606 + } 61.607 +@@ -764,7 +764,7 @@ 61.608 + rlvl->cbgheightexpn); 61.609 + 61.610 + rlvl->numbands = (!rlvlno) ? 1 : 3; 61.611 +- if (!(rlvl->bands = jas_malloc(rlvl->numbands * 61.612 ++ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, 61.613 + sizeof(jpc_dec_band_t)))) { 61.614 + return -1; 61.615 + } 61.616 +@@ -797,7 +797,7 @@ 61.617 + 61.618 + assert(rlvl->numprcs); 61.619 + 61.620 +- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) { 61.621 ++ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) { 61.622 + return -1; 61.623 + } 61.624 + 61.625 +@@ -834,7 +834,7 @@ 61.626 + if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) { 61.627 + return -1; 61.628 + } 61.629 +- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) { 61.630 ++ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) { 61.631 + return -1; 61.632 + } 61.633 + 61.634 +@@ -1069,12 +1069,12 @@ 61.635 + /* Apply an inverse intercomponent transform if necessary. */ 61.636 + switch (tile->cp->mctid) { 61.637 + case JPC_MCT_RCT: 61.638 +- assert(dec->numcomps == 3); 61.639 ++ assert(dec->numcomps >= 3); 61.640 + jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data, 61.641 + tile->tcomps[2].data); 61.642 + break; 61.643 + case JPC_MCT_ICT: 61.644 +- assert(dec->numcomps == 3); 61.645 ++ assert(dec->numcomps >= 3); 61.646 + jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data, 61.647 + tile->tcomps[2].data); 61.648 + break; 61.649 +@@ -1181,7 +1181,7 @@ 61.650 + return -1; 61.651 + } 61.652 + 61.653 +- if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) { 61.654 ++ if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) { 61.655 + return -1; 61.656 + } 61.657 + 61.658 +@@ -1204,7 +1204,7 @@ 61.659 + dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth); 61.660 + dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight); 61.661 + dec->numtiles = dec->numhtiles * dec->numvtiles; 61.662 +- if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) { 61.663 ++ if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) { 61.664 + return -1; 61.665 + } 61.666 + 61.667 +@@ -1228,7 +1228,7 @@ 61.668 + tile->pkthdrstreampos = 0; 61.669 + tile->pptstab = 0; 61.670 + tile->cp = 0; 61.671 +- if (!(tile->tcomps = jas_malloc(dec->numcomps * 61.672 ++ if (!(tile->tcomps = jas_calloc(dec->numcomps, 61.673 + sizeof(jpc_dec_tcomp_t)))) { 61.674 + return -1; 61.675 + } 61.676 +@@ -1280,7 +1280,7 @@ 61.677 + jpc_coc_t *coc = &ms->parms.coc; 61.678 + jpc_dec_tile_t *tile; 61.679 + 61.680 +- if (JAS_CAST(int, coc->compno) > dec->numcomps) { 61.681 ++ if (JAS_CAST(int, coc->compno) >= dec->numcomps) { 61.682 + jas_eprintf("invalid component number in COC marker segment\n"); 61.683 + return -1; 61.684 + } 61.685 +@@ -1306,7 +1306,7 @@ 61.686 + jpc_rgn_t *rgn = &ms->parms.rgn; 61.687 + jpc_dec_tile_t *tile; 61.688 + 61.689 +- if (JAS_CAST(int, rgn->compno) > dec->numcomps) { 61.690 ++ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) { 61.691 + jas_eprintf("invalid component number in RGN marker segment\n"); 61.692 + return -1; 61.693 + } 61.694 +@@ -1355,7 +1355,7 @@ 61.695 + jpc_qcc_t *qcc = &ms->parms.qcc; 61.696 + jpc_dec_tile_t *tile; 61.697 + 61.698 +- if (JAS_CAST(int, qcc->compno) > dec->numcomps) { 61.699 ++ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) { 61.700 + jas_eprintf("invalid component number in QCC marker segment\n"); 61.701 + return -1; 61.702 + } 61.703 +@@ -1489,7 +1489,7 @@ 61.704 + cp->numlyrs = 0; 61.705 + cp->mctid = 0; 61.706 + cp->csty = 0; 61.707 +- if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) { 61.708 ++ if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) { 61.709 + return 0; 61.710 + } 61.711 + if (!(cp->pchglist = jpc_pchglist_create())) { 61.712 +@@ -2048,7 +2048,7 @@ 61.713 + } 61.714 + streamlist->numstreams = 0; 61.715 + streamlist->maxstreams = 100; 61.716 +- if (!(streamlist->streams = jas_malloc(streamlist->maxstreams * 61.717 ++ if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams, 61.718 + sizeof(jas_stream_t *)))) { 61.719 + jas_free(streamlist); 61.720 + return 0; 61.721 +@@ -2068,8 +2068,8 @@ 61.722 + /* Grow the array of streams if necessary. */ 61.723 + if (streamlist->numstreams >= streamlist->maxstreams) { 61.724 + newmaxstreams = streamlist->maxstreams + 1024; 61.725 +- if (!(newstreams = jas_realloc(streamlist->streams, 61.726 +- (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) { 61.727 ++ if (!(newstreams = jas_realloc2(streamlist->streams, 61.728 ++ (newmaxstreams + 1024), sizeof(jas_stream_t *)))) { 61.729 + return -1; 61.730 + } 61.731 + for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) { 61.732 +@@ -2155,8 +2155,7 @@ 61.733 + { 61.734 + jpc_ppxstabent_t **newents; 61.735 + if (tab->maxents < maxents) { 61.736 +- newents = (tab->ents) ? jas_realloc(tab->ents, maxents * 61.737 +- sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *)); 61.738 ++ newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *)); 61.739 + if (!newents) { 61.740 + return -1; 61.741 + } 61.742 +--- a/src/libjasper/jpc/jpc_enc.c 2007-01-19 22:43:07.000000000 +0100 61.743 ++++ b/src/libjasper/jpc/jpc_enc.c 2015-01-28 17:57:34.122045503 +0100 61.744 +@@ -403,7 +403,7 @@ 61.745 + vsteplcm *= jas_image_cmptvstep(image, cmptno); 61.746 + } 61.747 + 61.748 +- if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) { 61.749 ++ if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) { 61.750 + goto error; 61.751 + } 61.752 + for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno, 61.753 +@@ -656,7 +656,7 @@ 61.754 + 61.755 + if (ilyrrates && numilyrrates > 0) { 61.756 + tcp->numlyrs = numilyrrates + 1; 61.757 +- if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) * 61.758 ++ if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1), 61.759 + sizeof(jpc_fix_t)))) { 61.760 + goto error; 61.761 + } 61.762 +@@ -940,7 +940,7 @@ 61.763 + siz->tilewidth = cp->tilewidth; 61.764 + siz->tileheight = cp->tileheight; 61.765 + siz->numcomps = cp->numcmpts; 61.766 +- siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)); 61.767 ++ siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)); 61.768 + assert(siz->comps); 61.769 + for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) { 61.770 + siz->comps[i].prec = cp->ccps[i].prec; 61.771 +@@ -977,7 +977,7 @@ 61.772 + return -1; 61.773 + } 61.774 + crg = &enc->mrk->parms.crg; 61.775 +- crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t)); 61.776 ++ crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t)); 61.777 + if (jpc_putms(enc->out, enc->cstate, enc->mrk)) { 61.778 + jas_eprintf("cannot write CRG marker\n"); 61.779 + return -1; 61.780 +@@ -1955,7 +1955,7 @@ 61.781 + tile->mctid = cp->tcp.mctid; 61.782 + 61.783 + tile->numlyrs = cp->tcp.numlyrs; 61.784 +- if (!(tile->lyrsizes = jas_malloc(tile->numlyrs * 61.785 ++ if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs, 61.786 + sizeof(uint_fast32_t)))) { 61.787 + goto error; 61.788 + } 61.789 +@@ -1964,7 +1964,7 @@ 61.790 + } 61.791 + 61.792 + /* Allocate an array for the per-tile-component information. */ 61.793 +- if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) { 61.794 ++ if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) { 61.795 + goto error; 61.796 + } 61.797 + /* Initialize a few members critical for error recovery. */ 61.798 +@@ -2110,7 +2110,7 @@ 61.799 + jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data), 61.800 + jas_seq2d_yend(tcmpt->data), bandinfos); 61.801 + 61.802 +- if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) { 61.803 ++ if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) { 61.804 + goto error; 61.805 + } 61.806 + for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls; 61.807 +@@ -2213,7 +2213,7 @@ 61.808 + rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn); 61.809 + rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs; 61.810 + 61.811 +- if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) { 61.812 ++ if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) { 61.813 + goto error; 61.814 + } 61.815 + for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands; 61.816 +@@ -2290,7 +2290,7 @@ 61.817 + band->synweight = bandinfo->synenergywt; 61.818 + 61.819 + if (band->data) { 61.820 +- if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) { 61.821 ++ if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) { 61.822 + goto error; 61.823 + } 61.824 + for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno, 61.825 +@@ -2422,7 +2422,7 @@ 61.826 + goto error; 61.827 + } 61.828 + 61.829 +- if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) { 61.830 ++ if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) { 61.831 + goto error; 61.832 + } 61.833 + for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks; 61.834 +--- a/src/libjasper/jpc/jpc_mqdec.c 2007-01-19 22:43:07.000000000 +0100 61.835 ++++ b/src/libjasper/jpc/jpc_mqdec.c 2015-01-28 17:57:34.126045570 +0100 61.836 +@@ -118,7 +118,7 @@ 61.837 + mqdec->in = in; 61.838 + mqdec->maxctxs = maxctxs; 61.839 + /* Allocate memory for the per-context state information. */ 61.840 +- if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) { 61.841 ++ if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) { 61.842 + goto error; 61.843 + } 61.844 + /* Set the current context to the first context. */ 61.845 +--- a/src/libjasper/jpc/jpc_mqenc.c 2007-01-19 22:43:07.000000000 +0100 61.846 ++++ b/src/libjasper/jpc/jpc_mqenc.c 2015-01-28 17:57:34.126045570 +0100 61.847 +@@ -197,7 +197,7 @@ 61.848 + mqenc->maxctxs = maxctxs; 61.849 + 61.850 + /* Allocate memory for the per-context state information. */ 61.851 +- if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) { 61.852 ++ if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) { 61.853 + goto error; 61.854 + } 61.855 + 61.856 +--- a/src/libjasper/jpc/jpc_qmfb.c 2007-01-19 22:43:07.000000000 +0100 61.857 ++++ b/src/libjasper/jpc/jpc_qmfb.c 2015-01-28 18:00:17.753785538 +0100 61.858 +@@ -306,11 +306,7 @@ 61.859 + { 61.860 + 61.861 + int bufsize = JPC_CEILDIVPOW2(numcols, 1); 61.862 +-#if !defined(HAVE_VLA) 61.863 + jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; 61.864 +-#else 61.865 +- jpc_fix_t splitbuf[bufsize]; 61.866 +-#endif 61.867 + jpc_fix_t *buf = splitbuf; 61.868 + register jpc_fix_t *srcptr; 61.869 + register jpc_fix_t *dstptr; 61.870 +@@ -318,15 +314,13 @@ 61.871 + register int m; 61.872 + int hstartcol; 61.873 + 61.874 +-#if !defined(HAVE_VLA) 61.875 + /* Get a buffer. */ 61.876 + if (bufsize > QMFB_SPLITBUFSIZE) { 61.877 +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { 61.878 ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { 61.879 + /* We have no choice but to commit suicide in this case. */ 61.880 + abort(); 61.881 + } 61.882 + } 61.883 +-#endif 61.884 + 61.885 + if (numcols >= 2) { 61.886 + hstartcol = (numcols + 1 - parity) >> 1; 61.887 +@@ -360,12 +354,10 @@ 61.888 + } 61.889 + } 61.890 + 61.891 +-#if !defined(HAVE_VLA) 61.892 + /* If the split buffer was allocated on the heap, free this memory. */ 61.893 + if (buf != splitbuf) { 61.894 + jas_free(buf); 61.895 + } 61.896 +-#endif 61.897 + 61.898 + } 61.899 + 61.900 +@@ -374,11 +366,7 @@ 61.901 + { 61.902 + 61.903 + int bufsize = JPC_CEILDIVPOW2(numrows, 1); 61.904 +-#if !defined(HAVE_VLA) 61.905 + jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; 61.906 +-#else 61.907 +- jpc_fix_t splitbuf[bufsize]; 61.908 +-#endif 61.909 + jpc_fix_t *buf = splitbuf; 61.910 + register jpc_fix_t *srcptr; 61.911 + register jpc_fix_t *dstptr; 61.912 +@@ -386,15 +374,13 @@ 61.913 + register int m; 61.914 + int hstartcol; 61.915 + 61.916 +-#if !defined(HAVE_VLA) 61.917 + /* Get a buffer. */ 61.918 + if (bufsize > QMFB_SPLITBUFSIZE) { 61.919 +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { 61.920 ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { 61.921 + /* We have no choice but to commit suicide in this case. */ 61.922 + abort(); 61.923 + } 61.924 + } 61.925 +-#endif 61.926 + 61.927 + if (numrows >= 2) { 61.928 + hstartcol = (numrows + 1 - parity) >> 1; 61.929 +@@ -428,12 +414,10 @@ 61.930 + } 61.931 + } 61.932 + 61.933 +-#if !defined(HAVE_VLA) 61.934 + /* If the split buffer was allocated on the heap, free this memory. */ 61.935 + if (buf != splitbuf) { 61.936 + jas_free(buf); 61.937 + } 61.938 +-#endif 61.939 + 61.940 + } 61.941 + 61.942 +@@ -442,11 +426,7 @@ 61.943 + { 61.944 + 61.945 + int bufsize = JPC_CEILDIVPOW2(numrows, 1); 61.946 +-#if !defined(HAVE_VLA) 61.947 + jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; 61.948 +-#else 61.949 +- jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE]; 61.950 +-#endif 61.951 + jpc_fix_t *buf = splitbuf; 61.952 + jpc_fix_t *srcptr; 61.953 + jpc_fix_t *dstptr; 61.954 +@@ -457,15 +437,13 @@ 61.955 + int m; 61.956 + int hstartcol; 61.957 + 61.958 +-#if !defined(HAVE_VLA) 61.959 + /* Get a buffer. */ 61.960 + if (bufsize > QMFB_SPLITBUFSIZE) { 61.961 +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { 61.962 ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { 61.963 + /* We have no choice but to commit suicide in this case. */ 61.964 + abort(); 61.965 + } 61.966 + } 61.967 +-#endif 61.968 + 61.969 + if (numrows >= 2) { 61.970 + hstartcol = (numrows + 1 - parity) >> 1; 61.971 +@@ -517,12 +495,10 @@ 61.972 + } 61.973 + } 61.974 + 61.975 +-#if !defined(HAVE_VLA) 61.976 + /* If the split buffer was allocated on the heap, free this memory. */ 61.977 + if (buf != splitbuf) { 61.978 + jas_free(buf); 61.979 + } 61.980 +-#endif 61.981 + 61.982 + } 61.983 + 61.984 +@@ -531,11 +507,7 @@ 61.985 + { 61.986 + 61.987 + int bufsize = JPC_CEILDIVPOW2(numrows, 1); 61.988 +-#if !defined(HAVE_VLA) 61.989 + jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; 61.990 +-#else 61.991 +- jpc_fix_t splitbuf[bufsize * numcols]; 61.992 +-#endif 61.993 + jpc_fix_t *buf = splitbuf; 61.994 + jpc_fix_t *srcptr; 61.995 + jpc_fix_t *dstptr; 61.996 +@@ -546,15 +518,13 @@ 61.997 + int m; 61.998 + int hstartcol; 61.999 + 61.1000 +-#if !defined(HAVE_VLA) 61.1001 + /* Get a buffer. */ 61.1002 + if (bufsize > QMFB_SPLITBUFSIZE) { 61.1003 +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { 61.1004 ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { 61.1005 + /* We have no choice but to commit suicide in this case. */ 61.1006 + abort(); 61.1007 + } 61.1008 + } 61.1009 +-#endif 61.1010 + 61.1011 + if (numrows >= 2) { 61.1012 + hstartcol = (numrows + 1 - parity) >> 1; 61.1013 +@@ -606,12 +576,10 @@ 61.1014 + } 61.1015 + } 61.1016 + 61.1017 +-#if !defined(HAVE_VLA) 61.1018 + /* If the split buffer was allocated on the heap, free this memory. */ 61.1019 + if (buf != splitbuf) { 61.1020 + jas_free(buf); 61.1021 + } 61.1022 +-#endif 61.1023 + 61.1024 + } 61.1025 + 61.1026 +@@ -619,26 +587,20 @@ 61.1027 + { 61.1028 + 61.1029 + int bufsize = JPC_CEILDIVPOW2(numcols, 1); 61.1030 +-#if !defined(HAVE_VLA) 61.1031 + jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; 61.1032 +-#else 61.1033 +- jpc_fix_t joinbuf[bufsize]; 61.1034 +-#endif 61.1035 + jpc_fix_t *buf = joinbuf; 61.1036 + register jpc_fix_t *srcptr; 61.1037 + register jpc_fix_t *dstptr; 61.1038 + register int n; 61.1039 + int hstartcol; 61.1040 + 61.1041 +-#if !defined(HAVE_VLA) 61.1042 + /* Allocate memory for the join buffer from the heap. */ 61.1043 + if (bufsize > QMFB_JOINBUFSIZE) { 61.1044 +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { 61.1045 ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { 61.1046 + /* We have no choice but to commit suicide. */ 61.1047 + abort(); 61.1048 + } 61.1049 + } 61.1050 +-#endif 61.1051 + 61.1052 + hstartcol = (numcols + 1 - parity) >> 1; 61.1053 + 61.1054 +@@ -670,12 +632,10 @@ 61.1055 + ++srcptr; 61.1056 + } 61.1057 + 61.1058 +-#if !defined(HAVE_VLA) 61.1059 + /* If the join buffer was allocated on the heap, free this memory. */ 61.1060 + if (buf != joinbuf) { 61.1061 + jas_free(buf); 61.1062 + } 61.1063 +-#endif 61.1064 + 61.1065 + } 61.1066 + 61.1067 +@@ -684,26 +644,20 @@ 61.1068 + { 61.1069 + 61.1070 + int bufsize = JPC_CEILDIVPOW2(numrows, 1); 61.1071 +-#if !defined(HAVE_VLA) 61.1072 + jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; 61.1073 +-#else 61.1074 +- jpc_fix_t joinbuf[bufsize]; 61.1075 +-#endif 61.1076 + jpc_fix_t *buf = joinbuf; 61.1077 + register jpc_fix_t *srcptr; 61.1078 + register jpc_fix_t *dstptr; 61.1079 + register int n; 61.1080 + int hstartcol; 61.1081 + 61.1082 +-#if !defined(HAVE_VLA) 61.1083 + /* Allocate memory for the join buffer from the heap. */ 61.1084 + if (bufsize > QMFB_JOINBUFSIZE) { 61.1085 +- if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) { 61.1086 ++ if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { 61.1087 + /* We have no choice but to commit suicide. */ 61.1088 + abort(); 61.1089 + } 61.1090 + } 61.1091 +-#endif 61.1092 + 61.1093 + hstartcol = (numrows + 1 - parity) >> 1; 61.1094 + 61.1095 +@@ -735,12 +689,10 @@ 61.1096 + ++srcptr; 61.1097 + } 61.1098 + 61.1099 +-#if !defined(HAVE_VLA) 61.1100 + /* If the join buffer was allocated on the heap, free this memory. */ 61.1101 + if (buf != joinbuf) { 61.1102 + jas_free(buf); 61.1103 + } 61.1104 +-#endif 61.1105 + 61.1106 + } 61.1107 + 61.1108 +@@ -749,11 +701,7 @@ 61.1109 + { 61.1110 + 61.1111 + int bufsize = JPC_CEILDIVPOW2(numrows, 1); 61.1112 +-#if !defined(HAVE_VLA) 61.1113 + jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; 61.1114 +-#else 61.1115 +- jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE]; 61.1116 +-#endif 61.1117 + jpc_fix_t *buf = joinbuf; 61.1118 + jpc_fix_t *srcptr; 61.1119 + jpc_fix_t *dstptr; 61.1120 +@@ -763,15 +711,13 @@ 61.1121 + register int i; 61.1122 + int hstartcol; 61.1123 + 61.1124 +-#if !defined(HAVE_VLA) 61.1125 + /* Allocate memory for the join buffer from the heap. */ 61.1126 + if (bufsize > QMFB_JOINBUFSIZE) { 61.1127 +- if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { 61.1128 ++ if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { 61.1129 + /* We have no choice but to commit suicide. */ 61.1130 + abort(); 61.1131 + } 61.1132 + } 61.1133 +-#endif 61.1134 + 61.1135 + hstartcol = (numrows + 1 - parity) >> 1; 61.1136 + 61.1137 +@@ -821,12 +767,10 @@ 61.1138 + srcptr += JPC_QMFB_COLGRPSIZE; 61.1139 + } 61.1140 + 61.1141 +-#if !defined(HAVE_VLA) 61.1142 + /* If the join buffer was allocated on the heap, free this memory. */ 61.1143 + if (buf != joinbuf) { 61.1144 + jas_free(buf); 61.1145 + } 61.1146 +-#endif 61.1147 + 61.1148 + } 61.1149 + 61.1150 +@@ -835,11 +779,7 @@ 61.1151 + { 61.1152 + 61.1153 + int bufsize = JPC_CEILDIVPOW2(numrows, 1); 61.1154 +-#if !defined(HAVE_VLA) 61.1155 + jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; 61.1156 +-#else 61.1157 +- jpc_fix_t joinbuf[bufsize * numcols]; 61.1158 +-#endif 61.1159 + jpc_fix_t *buf = joinbuf; 61.1160 + jpc_fix_t *srcptr; 61.1161 + jpc_fix_t *dstptr; 61.1162 +@@ -849,15 +789,13 @@ 61.1163 + register int i; 61.1164 + int hstartcol; 61.1165 + 61.1166 +-#if !defined(HAVE_VLA) 61.1167 + /* Allocate memory for the join buffer from the heap. */ 61.1168 + if (bufsize > QMFB_JOINBUFSIZE) { 61.1169 +- if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) { 61.1170 ++ if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { 61.1171 + /* We have no choice but to commit suicide. */ 61.1172 + abort(); 61.1173 + } 61.1174 + } 61.1175 +-#endif 61.1176 + 61.1177 + hstartcol = (numrows + 1 - parity) >> 1; 61.1178 + 61.1179 +@@ -907,12 +845,10 @@ 61.1180 + srcptr += numcols; 61.1181 + } 61.1182 + 61.1183 +-#if !defined(HAVE_VLA) 61.1184 + /* If the join buffer was allocated on the heap, free this memory. */ 61.1185 + if (buf != joinbuf) { 61.1186 + jas_free(buf); 61.1187 + } 61.1188 +-#endif 61.1189 + 61.1190 + } 61.1191 + 61.1192 +--- a/src/libjasper/jpc/jpc_t1enc.c 2007-01-19 22:43:07.000000000 +0100 61.1193 ++++ b/src/libjasper/jpc/jpc_t1enc.c 2015-01-28 17:57:34.128045603 +0100 61.1194 +@@ -219,7 +219,7 @@ 61.1195 + 61.1196 + cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0; 61.1197 + if (cblk->numpasses > 0) { 61.1198 +- cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t)); 61.1199 ++ cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t)); 61.1200 + assert(cblk->passes); 61.1201 + } else { 61.1202 + cblk->passes = 0; 61.1203 +--- a/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100 61.1204 ++++ b/src/libjasper/jpc/jpc_t2cod.c 2015-01-28 17:57:34.128045603 +0100 61.1205 +@@ -573,7 +573,7 @@ 61.1206 + } 61.1207 + if (pchglist->numpchgs >= pchglist->maxpchgs) { 61.1208 + newmaxpchgs = pchglist->maxpchgs + 128; 61.1209 +- if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) { 61.1210 ++ if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) { 61.1211 + return -1; 61.1212 + } 61.1213 + pchglist->maxpchgs = newmaxpchgs; 61.1214 +--- a/src/libjasper/jpc/jpc_t2dec.c 2007-01-19 22:43:07.000000000 +0100 61.1215 ++++ b/src/libjasper/jpc/jpc_t2dec.c 2015-01-28 17:57:34.129045620 +0100 61.1216 +@@ -478,7 +478,7 @@ 61.1217 + return 0; 61.1218 + } 61.1219 + pi->numcomps = dec->numcomps; 61.1220 +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { 61.1221 ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { 61.1222 + jpc_pi_destroy(pi); 61.1223 + return 0; 61.1224 + } 61.1225 +@@ -490,7 +490,7 @@ 61.1226 + for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps; 61.1227 + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { 61.1228 + picomp->numrlvls = tcomp->numrlvls; 61.1229 +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * 61.1230 ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, 61.1231 + sizeof(jpc_pirlvl_t)))) { 61.1232 + jpc_pi_destroy(pi); 61.1233 + return 0; 61.1234 +@@ -503,7 +503,7 @@ 61.1235 + rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) { 61.1236 + /* XXX sizeof(long) should be sizeof different type */ 61.1237 + pirlvl->numprcs = rlvl->numprcs; 61.1238 +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * 61.1239 ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, 61.1240 + sizeof(long)))) { 61.1241 + jpc_pi_destroy(pi); 61.1242 + return 0; 61.1243 +--- a/src/libjasper/jpc/jpc_t2enc.c 2007-01-19 22:43:07.000000000 +0100 61.1244 ++++ b/src/libjasper/jpc/jpc_t2enc.c 2015-01-28 17:57:34.129045620 +0100 61.1245 +@@ -565,7 +565,7 @@ 61.1246 + } 61.1247 + pi->pktno = -1; 61.1248 + pi->numcomps = cp->numcmpts; 61.1249 +- if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) { 61.1250 ++ if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) { 61.1251 + jpc_pi_destroy(pi); 61.1252 + return 0; 61.1253 + } 61.1254 +@@ -577,7 +577,7 @@ 61.1255 + for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps; 61.1256 + compno < pi->numcomps; ++compno, ++tcomp, ++picomp) { 61.1257 + picomp->numrlvls = tcomp->numrlvls; 61.1258 +- if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls * 61.1259 ++ if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls, 61.1260 + sizeof(jpc_pirlvl_t)))) { 61.1261 + jpc_pi_destroy(pi); 61.1262 + return 0; 61.1263 +@@ -591,7 +591,7 @@ 61.1264 + /* XXX sizeof(long) should be sizeof different type */ 61.1265 + pirlvl->numprcs = rlvl->numprcs; 61.1266 + if (rlvl->numprcs) { 61.1267 +- if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs * 61.1268 ++ if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs, 61.1269 + sizeof(long)))) { 61.1270 + jpc_pi_destroy(pi); 61.1271 + return 0; 61.1272 +--- a/src/libjasper/jpc/jpc_tagtree.c 2007-01-19 22:43:07.000000000 +0100 61.1273 ++++ b/src/libjasper/jpc/jpc_tagtree.c 2015-01-28 17:57:34.130045636 +0100 61.1274 +@@ -125,7 +125,7 @@ 61.1275 + ++numlvls; 61.1276 + } while (n > 1); 61.1277 + 61.1278 +- if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) { 61.1279 ++ if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) { 61.1280 + return 0; 61.1281 + } 61.1282 + 61.1283 +--- a/src/libjasper/jpc/jpc_util.c 2007-01-19 22:43:07.000000000 +0100 61.1284 ++++ b/src/libjasper/jpc/jpc_util.c 2015-01-28 17:57:34.130045636 +0100 61.1285 +@@ -109,7 +109,7 @@ 61.1286 + } 61.1287 + 61.1288 + if (n) { 61.1289 +- if (!(vs = jas_malloc(n * sizeof(double)))) { 61.1290 ++ if (!(vs = jas_alloc2(n, sizeof(double)))) { 61.1291 + return -1; 61.1292 + } 61.1293 + 61.1294 +--- a/src/libjasper/mif/mif_cod.c 2007-01-19 22:43:05.000000000 +0100 61.1295 ++++ b/src/libjasper/mif/mif_cod.c 2015-01-28 17:57:34.131045653 +0100 61.1296 +@@ -438,8 +438,7 @@ 61.1297 + int cmptno; 61.1298 + mif_cmpt_t **newcmpts; 61.1299 + assert(maxcmpts >= hdr->numcmpts); 61.1300 +- newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) : 61.1301 +- jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *)); 61.1302 ++ newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *)); 61.1303 + if (!newcmpts) { 61.1304 + return -1; 61.1305 + }
62.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 62.2 +++ b/jasper/stuff/patches/series Fri Apr 21 14:48:05 2017 +0300 62.3 @@ -0,0 +1,1 @@ 62.4 +jasper-1.900.1-security_fixes-2.patch
63.1 --- a/libexif-dev/receipt Sat Apr 15 16:06:43 2017 +0300 63.2 +++ b/libexif-dev/receipt Fri Apr 21 14:48:05 2017 +0300 63.3 @@ -1,22 +1,19 @@ 63.4 # SliTaz package receipt. 63.5 63.6 PACKAGE="libexif-dev" 63.7 -VERSION="0.6.20" 63.8 +VERSION="0.6.21" 63.9 CATEGORY="development" 63.10 -SHORT_DESC="Libexif devel files." 63.11 -WANTED="libexif" 63.12 +SHORT_DESC="Library for easy access to EXIF data (development files)" 63.13 MAINTAINER="pankso@slitaz.org" 63.14 LICENSE="LGPL2.1" 63.15 WEB_SITE="http://libexif.sourceforge.net/" 63.16 HOST_ARCH="i486 arm" 63.17 63.18 -DEPENDS="libexif pkg-config" 63.19 +WANTED="libexif" 63.20 +DEPENDS="libexif" 63.21 63.22 # Rules to gen a SliTaz package suitable for Tazpkg. 63.23 genpkg_rules() 63.24 { 63.25 - mkdir -p $fs/usr/lib 63.26 - cp -a $install/usr/lib/*.*a $fs/usr/lib 63.27 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 63.28 - cp -a $install/usr/include $fs/usr 63.29 + cook_copy_files *.h *.la *.pc 63.30 }
64.1 --- a/libexif/receipt Sat Apr 15 16:06:43 2017 +0300 64.2 +++ b/libexif/receipt Fri Apr 21 14:48:05 2017 +0300 64.3 @@ -1,29 +1,31 @@ 64.4 # SliTaz package receipt. 64.5 64.6 PACKAGE="libexif" 64.7 -VERSION="0.6.20" 64.8 -CATEGORY="system-tools" 64.9 -SHORT_DESC="Reads and writes EXIF metainformation from and to image files." 64.10 +VERSION="0.6.21" 64.11 +CATEGORY="graphics" 64.12 +SHORT_DESC="Library for easy access to EXIF data" 64.13 MAINTAINER="pankso@slitaz.org" 64.14 LICENSE="LGPL2.1" 64.15 -TARBALL="$PACKAGE-$VERSION.tar.gz" 64.16 WEB_SITE="http://libexif.sourceforge.net/" 64.17 +HOST_ARCH="i486 arm" 64.18 + 64.19 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 64.20 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 64.21 -HOST_ARCH="i486 arm" 64.22 + 64.23 +BUILD_DEPENDS="gettext" 64.24 64.25 # Rules to configure and make the package. 64.26 compile_rules() 64.27 { 64.28 ./configure \ 64.29 - --prefix=/usr \ 64.30 - $CONFIGURE_ARGS 64.31 - make 64.32 - make DESTDIR=$DESTDIR install 64.33 + --with-doc-dir=/usr/share/doc/libexif-$VERSION \ 64.34 + --disable-static \ 64.35 + $CONFIGURE_ARGS && 64.36 + make && make install 64.37 } 64.38 64.39 # Rules to gen a SliTaz package suitable for Tazpkg. 64.40 genpkg_rules() 64.41 { 64.42 - mkdir -p $fs/usr/lib 64.43 - cp -a $install/usr/lib/*.so* $fs/usr/lib 64.44 + cook_copy_files *.so* 64.45 }
65.1 --- a/libfm-dev/receipt Sat Apr 15 16:06:43 2017 +0300 65.2 +++ b/libfm-dev/receipt Fri Apr 21 14:48:05 2017 +0300 65.3 @@ -7,16 +7,19 @@ 65.4 MAINTAINER="pankso@slitaz.org" 65.5 LICENSE="GPL2" 65.6 WEB_SITE="http://pcmanfm.sourceforge.net" 65.7 -WANTED="libfm" 65.8 HOST_ARCH="i486 arm" 65.9 65.10 -DEPENDS="libfm pkg-config glib-dev libgio-dev" 65.11 +WANTED="libfm" 65.12 +DEPENDS="libfm libfm-gtk libfm-extra-dev atk-dev bzip2-dev cairo-dev \ 65.13 +fontconfig-dev freetype-dev gdk-pixbuf-dev glib-dev glibc-dev gtk+-dev \ 65.14 +harfbuzz-dev libexif-dev libffi-dev libgio-dev liblzma-dev libpng-dev \ 65.15 +libxcb-dev libxml2-dev menu-cache-dev pango-dev pcre-dev pixman-dev \ 65.16 +xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 65.17 +xorg-libXrender-dev zlib-dev" 65.18 65.19 # Rules to gen a SliTaz package suitable for Tazpkg. 65.20 genpkg_rules() 65.21 { 65.22 - mkdir -p $fs/usr/lib 65.23 - cp -a $install/usr/include $fs/usr 65.24 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 65.25 - cp -a $install/usr/lib/*a $fs/usr/lib 65.26 + cook_copy_files *.h *.la *.pc libfm 65.27 + cook_split_rm libfm-extra-dev 65.28 }
66.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 66.2 +++ b/libfm-extra-dev/receipt Fri Apr 21 14:48:05 2017 +0300 66.3 @@ -0,0 +1,18 @@ 66.4 +# SliTaz package receipt. 66.5 + 66.6 +PACKAGE="libfm-extra-dev" 66.7 +VERSION="1.2.5" 66.8 +CATEGORY="development" 66.9 +SHORT_DESC="Library and other files required by menu-cache-gen (development files)" 66.10 +MAINTAINER="al.bobylev@gmail.com" 66.11 +LICENSE="GPL2" 66.12 +WEB_SITE="https://github.com/lxde/libfm" 66.13 + 66.14 +WANTED="libfm-extra" 66.15 +DEPENDS="libfm-extra glib-dev glibc-dev libffi-dev libgio-dev pcre-dev zlib-dev" 66.16 + 66.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 66.18 +genpkg_rules() 66.19 +{ 66.20 + cook_copy_files *.h *.la *.pc libfm 66.21 +}
67.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 67.2 +++ b/libfm-extra/receipt Fri Apr 21 14:48:05 2017 +0300 67.3 @@ -0,0 +1,34 @@ 67.4 +# SliTaz package receipt. 67.5 + 67.6 +PACKAGE="libfm-extra" 67.7 +VERSION="1.2.5" 67.8 +CATEGORY="system-tools" 67.9 +SHORT_DESC="Library and other files required by menu-cache-gen" 67.10 +MAINTAINER="al.bobylev@gmail.com" 67.11 +LICENSE="GPL2" 67.12 +WEB_SITE="https://github.com/lxde/libfm" 67.13 + 67.14 +TARBALL="libfm-$VERSION.tar.xz" 67.15 +WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL" 67.16 + 67.17 +DEPENDS="glib libgio" 67.18 +BUILD_DEPENDS="intltool gtk-doc" 67.19 +SIBLINGS="libfm" 67.20 + 67.21 +# Rules to configure and make the package. 67.22 +compile_rules() 67.23 +{ 67.24 + ./configure \ 67.25 + --sysconfdir=/etc \ 67.26 + --with-extra-only \ 67.27 + --with-gtk=no \ 67.28 + --disable-static \ 67.29 + $CONFIGURE_ARGS && 67.30 + make && make install 67.31 +} 67.32 + 67.33 +# Rules to gen a SliTaz package suitable for Tazpkg. 67.34 +genpkg_rules() 67.35 +{ 67.36 + cook_copy_files *.so* 67.37 +}
68.1 --- a/libfm-gtk/receipt Sat Apr 15 16:06:43 2017 +0300 68.2 +++ b/libfm-gtk/receipt Fri Apr 21 14:48:05 2017 +0300 68.3 @@ -14,10 +14,6 @@ 68.4 # Rules to gen a SliTaz package suitable for Tazpkg. 68.5 genpkg_rules() 68.6 { 68.7 - mkdir -p $fs/usr/lib/libfm/modules $fs/usr/share/libfm 68.8 - cp -a $install/usr/bin $fs/usr 68.9 - cp -a $install/usr/lib/libfm-gtk.so* $fs/usr/lib 68.10 - cp -a $install/usr/lib/libfm/modules/gtk* $fs/usr/lib/libfm/modules 68.11 - cp -a $install/usr/share/applications $fs/usr/share 68.12 - cp -a $install/usr/share/libfm/images $install/usr/share/libfm/ui $fs/usr/share/libfm 68.13 + cook_copy_folders bin applications images ui 68.14 + cook_copy_files libfm-gtk.so* gtk*.so 68.15 }
69.1 --- a/libfm/receipt Sat Apr 15 16:06:43 2017 +0300 69.2 +++ b/libfm/receipt Fri Apr 21 14:48:05 2017 +0300 69.3 @@ -6,35 +6,34 @@ 69.4 SHORT_DESC="File management support (core library)" 69.5 MAINTAINER="pankso@slitaz.org" 69.6 LICENSE="GPL2" 69.7 +WEB_SITE="http://pcmanfm.sourceforge.net" 69.8 +HOST_ARCH="i486 arm" 69.9 +CONFIG_FILES="/etc/xdg/libfm/libfm.conf" 69.10 +GENERIC_MENUS="no" 69.11 +SUGGESTED="gvfs" 69.12 + 69.13 TARBALL="$PACKAGE-$VERSION.tar.xz" 69.14 -WEB_SITE="http://pcmanfm.sourceforge.net" 69.15 WGET_URL="$SF_MIRROR/pcmanfm/files/$TARBALL" 69.16 -EXTRA_SOURCE_FILES="$PACKAGE-reversepatch_SF949_7daeaf3.u" # Really fix segfault 69.17 -WGET_URL2="https://github.com/lxde/libfm/commit/7daeaf3.patch" 69.18 -#WGETURL3="https://github.com/lxde/libfm/commit/2c00984.patch" #narrow icon cell 69.19 -HOST_ARCH="i486 arm" 69.20 -GENERIC_MENUS="no" 69.21 69.22 -SUGGESTED="gvfs" 69.23 -DEPENDS="glib glibc-base libffi libgio menu-cache pcre zlib" 69.24 -BUILD_DEPENDS="gtk+-dev dbus-glib-dev dbus-dev startup-notification-dev \ 69.25 +DEPENDS="glib libexif libffi libfm-extra libgio menu-cache pcre zlib" 69.26 +BUILD_DEPENDS="vala intltool gtk+-dev menu-cache-dev libexif-dev gtk-doc" 69.27 +BUILD_DEPENDS_arm="gtk+-dev dbus-glib-dev dbus-dev startup-notification-dev \ 69.28 libxcb-dev xcb-util-dev menu-cache-dev expat-dev libgio-dev \ 69.29 -shared-mime-info-dev" # git-version deps: gtk-doc libtool automake 69.30 +shared-mime-info-dev" 69.31 +SIBLINGS="libfm-extra" 69.32 +SPLIT="libfm-gtk libfm-dev" 69.33 69.34 case "$ARCH" in 69.35 - i?86) BUILD_DEPENDS="$BUILD_DEPENDS intltool vala" 69.36 + arm*) BUILD_DEPENDS=$BUILD_DEPENDS_arm;; 69.37 esac 69.38 69.39 # Rules to configure and make the package. 69.40 compile_rules() 69.41 { 69.42 - [ -s $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES ] || \ 69.43 - wget -O $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES $WGET_URL2 69.44 - patch -p1 -R -i $SOURCES_REPOSITORY/$EXTRA_SOURCE_FILES 69.45 - # fix freeze when using custom action with "inode/directory": 69.46 - sed 's|TRUE, 0.5, 0.0|FALSE, 0.0f, 0.0f|' -i src/gtk/fm-standard-view.c 69.47 ./configure \ 69.48 --sysconfdir=/etc \ 69.49 + --disable-static \ 69.50 + --enable-gtk-doc \ 69.51 $CONFIGURE_ARGS && 69.52 make && make install 69.53 } 69.54 @@ -42,12 +41,10 @@ 69.55 # Rules to gen a SliTaz package suitable for Tazpkg. 69.56 genpkg_rules() 69.57 { 69.58 - mkdir -p $fs/usr/lib/libfm/modules $fs/usr/share/libfm 69.59 - cp -a $install/etc $fs 69.60 - cp -a $install/usr/lib/libfm.so* $fs/usr/lib 69.61 - cp -a $install/usr/lib/libfm-extra.so* $fs/usr/lib 69.62 - cp -a $install/usr/lib/libfm/modules/vfs* $fs/usr/lib/libfm/modules 69.63 - cp -a $install/usr/share/libfm/*.list $fs/usr/share/libfm 69.64 + cook_copy_folders etc 69.65 + cook_copy_files libfm.so* vfs*.so *.list 69.66 + 69.67 + # extend xarchiver mime_types 69.68 sed "s|application/deb;$|&application/x-xz-compressed-tar;|" -i \ 69.69 $fs/usr/share/libfm/archivers.list 69.70 # define terminal
70.1 --- a/libgnutls/receipt Sat Apr 15 16:06:43 2017 +0300 70.2 +++ b/libgnutls/receipt Fri Apr 21 14:48:05 2017 +0300 70.3 @@ -1,21 +1,20 @@ 70.4 # SliTaz package receipt. 70.5 70.6 PACKAGE="libgnutls" 70.7 -VERSION="3.3.16" 70.8 +VERSION="3.5.3" 70.9 CATEGORY="security" 70.10 -SHORT_DESC="GNU Transport Layer Security Library headers" 70.11 +SHORT_DESC="GNU Transport Layer Security Library (shared libraries)" 70.12 MAINTAINER="erjo@slitaz.org" 70.13 LICENSE="GPL3" 70.14 +WEB_SITE="http://gnutls.org/" 70.15 +HOST_ARCH="i486 arm" 70.16 +SUGGESTED="cacerts" 70.17 + 70.18 WANTED="gnutls" 70.19 -WEB_SITE="http://www.gnu.org/software/gnutls/" 70.20 -HOST_ARCH="i486 arm" 70.21 - 70.22 -DEPENDS="nettle libtasn1" 70.23 -SUGGESTED="cacerts" 70.24 +DEPENDS="gmp libtasn1 nettle p11-kit zlib" 70.25 70.26 # Rules to gen a SliTaz package suitable for Tazpkg. 70.27 genpkg_rules() 70.28 { 70.29 - mkdir -p $fs/usr/lib 70.30 - cp -a $install/usr/lib/*.so* $fs/usr/lib 70.31 + cook_copy_files *.so* 70.32 }
71.1 --- a/libgphoto2-dev/receipt Sat Apr 15 16:06:43 2017 +0300 71.2 +++ b/libgphoto2-dev/receipt Fri Apr 21 14:48:05 2017 +0300 71.3 @@ -1,25 +1,20 @@ 71.4 # SliTaz package receipt. 71.5 71.6 PACKAGE="libgphoto2-dev" 71.7 -VERSION="2.4.11" 71.8 +VERSION="2.5.13" 71.9 CATEGORY="development" 71.10 -SHORT_DESC="libgphoto2 devel files" 71.11 +SHORT_DESC="Core library of gphoto2 to access photos from digital camera (development files)" 71.12 MAINTAINER="jozee@slitaz.org" 71.13 LICENSE="LGPL2.1" 71.14 +WEB_SITE="http://www.gphoto.org/" 71.15 + 71.16 WANTED="libgphoto2" 71.17 -WEB_SITE="http://www.gphoto.org" 71.18 - 71.19 -DEPENDS="libgphoto2 libexif-dev libusb-dev pkg-config" 71.20 +DEPENDS="libgphoto2 eudev-dev glibc-dev libexif-dev libjpeg-turbo-dev \ 71.21 +liblzma-dev libtool libusb-dev libxml2-dev zlib-dev" 71.22 71.23 # Rules to gen a SliTaz package suitable for Tazpkg. 71.24 genpkg_rules() 71.25 { 71.26 - mkdir -p $fs/usr/lib 71.27 - cp -a $install/usr/include $fs/usr 71.28 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 71.29 - cp -a $install/usr/lib/*.*a $fs/usr/lib/ 71.30 - cp -a $install/usr/lib/libgphoto2_port $fs/usr/lib/ 71.31 - 71.32 - # rm *.so files 71.33 - find $fs/usr/lib -name "*.so*" -exec rm -f {} \; 2> /dev/null 71.34 + cook_copy_folders bin 71.35 + cook_copy_files *.h *.la *.pc 71.36 }
72.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 72.2 +++ b/libgphoto2/description.txt Fri Apr 21 14:48:05 2017 +0300 72.3 @@ -0,0 +1,3 @@ 72.4 +gPhoto is a program and library framework that lets users download pictures 72.5 +from their digital cameras. The libgphoto2 library gives you access to hundreds 72.6 +of models of digital cameras on several platforms.
73.1 --- a/libgphoto2/receipt Sat Apr 15 16:06:43 2017 +0300 73.2 +++ b/libgphoto2/receipt Fri Apr 21 14:48:05 2017 +0300 73.3 @@ -1,25 +1,29 @@ 73.4 # SliTaz package receipt. 73.5 73.6 PACKAGE="libgphoto2" 73.7 -VERSION="2.4.11" 73.8 +VERSION="2.5.13" 73.9 CATEGORY="graphics" 73.10 -SHORT_DESC="core library of gphoto2 to access photos from digital camera" 73.11 +SHORT_DESC="Core library of gphoto2 to access photos from digital camera" 73.12 MAINTAINER="jozee@slitaz.org" 73.13 LICENSE="LGPL2.1" 73.14 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 73.15 -WEB_SITE="http://www.gphoto.org" 73.16 -WGET_URL="$SF_MIRROR/gphoto/$TARBALL" 73.17 +WEB_SITE="http://www.gphoto.org/" 73.18 TAGS="camera photo" 73.19 73.20 -DEPENDS="libexif jpeg libusb libusb-compat libltdl hal" 73.21 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 73.22 +WGET_URL="$SF_MIRROR/gphoto/$TARBALL" 73.23 + 73.24 +DEPENDS="eudev libexif libjpeg-turbo libltdl liblzma libusb libxml2 zlib" 73.25 BUILD_DEPENDS="jpeg-dev libexif-dev libtool libexif jpeg libusb libusb-dev \ 73.26 libusb-compat libusb-compat-dev pkg-config" 73.27 73.28 +BUILD_DEPENDS="libtool gettext libjpeg-turbo-dev libexif-dev libusb-dev" 73.29 + 73.30 # Rules to configure and make the package. 73.31 compile_rules() 73.32 { 73.33 + find $src -name '*.c' -exec sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' \{\} \; 73.34 + 73.35 ./configure \ 73.36 - --prefix=/usr \ 73.37 udevscriptdir=/lib/udev \ 73.38 --with-exif \ 73.39 --disable-static \ 73.40 @@ -31,25 +35,9 @@ 73.41 # Rules to gen a SliTaz package suitable for Tazpkg. 73.42 genpkg_rules() 73.43 { 73.44 - mkdir -p \ 73.45 - $fs/usr/lib/$PACKAGE \ 73.46 - $fs/usr/share \ 73.47 - $fs/lib \ 73.48 - $fs/usr/share/hal/fdi/information/20thirdparty \ 73.49 - $fs/etc/udev/rules.d 73.50 - cp -a $install/usr/bin $fs/usr 73.51 - cp -a $install/usr/lib/$PACKAGE $fs/usr/lib 73.52 - cp -a $install/usr/lib/${PACKAGE}_port $fs/usr/lib 73.53 - cp -a $install/usr/lib/*so* $fs/usr/lib 73.54 - cp -a $install/usr/share/$PACKAGE $fs/usr/share 73.55 - cp -a $install/lib/udev $fs/lib 73.56 - 73.57 - # rm all archive files 73.58 - find $fs/usr/lib -name "*.*a" -exec rm -f {} \; 2> /dev/null 73.59 - 73.60 - # fix permissions 73.61 - chmod +x $fs/lib/udev/check* 73.62 - chmod +x $fs/usr/bin/gphoto2* 73.63 + cook_copy_files *.so* print-camera-list check-ptp-camera 73.64 + cook_copy_folders konica vcamera 73.65 + rm -rf $fs/usr/share/doc # *.so* files here 73.66 } 73.67 73.68 post_install() 73.69 @@ -64,21 +52,23 @@ 73.70 export CAMLIBS="$1/usr/lib/libgphoto2/$VERSION" 73.71 73.72 # HAL file 73.73 - "$CAM_LIST" hal-fdi > "$HAL_FDI" || return 1 73.74 + mkdir -p "$(dirname "$HAL_FDI")" 73.75 + "$CAM_LIST" hal-fdi > "$HAL_FDI" 73.76 73.77 #udev rule 73.78 - "$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE" || return 1 73.79 + "$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE" 73.80 73.81 - tazpkg reconfigure udev --root="$1" 73.82 + tazpkg reconfigure eudev --root="$1" 73.83 73.84 # add group camera 73.85 if ! grep -q camera "$1/etc/group"; then 73.86 chroot "$1/" addgroup -g 97 camera 73.87 fi 73.88 73.89 - echo 73.90 - echo "Don't forget to add yourself to group camera to use libgphoto2:" 73.91 - echo " # addgroup tux camera" 73.92 + [ -n "$quiet" ] || cat <<EOT 73.93 +Don't forget to add yourself to group camera to use libgphoto2: 73.94 + # addgroup tux camera 73.95 +EOT 73.96 } 73.97 73.98 post_remove()
74.1 --- a/libmng-dev/receipt Sat Apr 15 16:06:43 2017 +0300 74.2 +++ b/libmng-dev/receipt Fri Apr 21 14:48:05 2017 +0300 74.3 @@ -1,21 +1,18 @@ 74.4 # SliTaz package receipt. 74.5 74.6 PACKAGE="libmng-dev" 74.7 -VERSION="1.0.10" 74.8 +VERSION="2.0.3" 74.9 CATEGORY="development" 74.10 -SHORT_DESC="dev file for libmng" 74.11 +SHORT_DESC="Multiple-image Network Graphics (MNG) Reference Library (development files)" 74.12 MAINTAINER="allan316@gmail.com" 74.13 -LICENSE="BSD" 74.14 -WEB_SITE="http://libmng.sourceforge.net" 74.15 +LICENSE="zlib/libpng" 74.16 +WEB_SITE="http://libmng.com/" 74.17 + 74.18 WANTED="libmng" 74.19 - 74.20 -DEPENDS="libmng lcms-dev jpeg-dev zlib-dev" 74.21 +DEPENDS="libmng lcms2-dev libjpeg-turbo-dev zlib-dev" 74.22 74.23 # Rules to gen a SliTaz package suitable for Tazpkg. 74.24 genpkg_rules() 74.25 { 74.26 - mkdir -p $fs/usr/lib 74.27 - cp -a $install/usr/include $fs/usr 74.28 - cp -a $install/usr/lib/*.*a $fs/usr/lib 74.29 + cook_copy_files *.h *.la *.pc 74.30 } 74.31 -
75.1 --- a/libmng/receipt Sat Apr 15 16:06:43 2017 +0300 75.2 +++ b/libmng/receipt Fri Apr 21 14:48:05 2017 +0300 75.3 @@ -1,39 +1,34 @@ 75.4 # SliTaz package receipt. 75.5 75.6 PACKAGE="libmng" 75.7 -VERSION="1.0.10" 75.8 -CATEGORY="development" 75.9 -SHORT_DESC="library for multi network graphics" 75.10 +VERSION="2.0.3" 75.11 +CATEGORY="graphics" 75.12 +SHORT_DESC="Multiple-image Network Graphics (MNG) Reference Library" 75.13 MAINTAINER="allan316@gmail.com" 75.14 -LICENSE="BSD" 75.15 -TARBALL="$PACKAGE-$VERSION.tar.gz" 75.16 -WEB_SITE="http://libmng.sourceforge.net" 75.17 +LICENSE="zlib/libpng" 75.18 +WEB_SITE="http://libmng.com/" 75.19 + 75.20 +TARBALL="$PACKAGE-$VERSION.tar.xz" 75.21 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 75.22 75.23 -DEPENDS="lcms jpeg zlib" 75.24 -BUILD_DEPENDS="autoconf automake lcms-dev jpeg-dev libtool" 75.25 +DEPENDS="lcms2 libjpeg-turbo zlib" 75.26 +BUILD_DEPENDS="zlib-dev libjpeg-turbo-dev lcms2-dev" 75.27 75.28 # Rules to configure and make the package. 75.29 compile_rules() 75.30 { 75.31 - cd $src 75.32 - sed -i 's/ [^ ]*ansi2knr//' makefiles/configure.in makefiles/Makefile.am 75.33 - sed -i 's/AM_C_PROTOTYPES/# &/' makefiles/configure.in 75.34 - ln -sf makefiles/configure.in . && 75.35 - ln -sf makefiles/Makefile.am . && 75.36 - autoreconf -f -i && 75.37 ./configure \ 75.38 - --prefix=/usr \ 75.39 - --infodir=/usr/share/info \ 75.40 - --mandir=/usr/share/man \ 75.41 + --disable-static \ 75.42 $CONFIGURE_ARGS && 75.43 - make && make DESTDIR=$DESTDIR install 75.44 + make && make install && 75.45 + 75.46 + docdir=$install/usr/share/doc/libmng-$VERSION && 75.47 + install -v -m755 -d $docdir && 75.48 + install -v -m644 doc/libmng.txt $docdir 75.49 } 75.50 75.51 # Rules to gen a SliTaz package suitable for Tazpkg. 75.52 genpkg_rules() 75.53 { 75.54 - mkdir -p $fs/usr/lib 75.55 - cp -a $install/usr/lib/*.so* $fs/usr/lib 75.56 + cook_copy_files *.so* 75.57 } 75.58 -
76.1 --- a/libmtp-dev/receipt Sat Apr 15 16:06:43 2017 +0300 76.2 +++ b/libmtp-dev/receipt Fri Apr 21 14:48:05 2017 +0300 76.3 @@ -1,21 +1,18 @@ 76.4 # SliTaz package receipt. 76.5 76.6 PACKAGE="libmtp-dev" 76.7 -VERSION="1.1.6" 76.8 +VERSION="1.1.13" 76.9 CATEGORY="development" 76.10 -SHORT_DESC="LGPL library implementation of the Media Transfer Protocol (MTP)" 76.11 +SHORT_DESC="Access to MTP devices: mp3 players, Android phones (development files)" 76.12 MAINTAINER="keupont@no-log.org" 76.13 LICENSE="LGPL2.1" 76.14 WEB_SITE="http://libmtp.sourceforge.net/" 76.15 + 76.16 WANTED="libmtp" 76.17 - 76.18 -DEPENDS="libmtp libusb-dev pkg-config" 76.19 +DEPENDS="libmtp eudev-dev libgcrypt-dev libgpg-error-dev libusb-dev" 76.20 76.21 # Rules to gen a SliTaz package suitable for Tazpkg. 76.22 genpkg_rules() 76.23 { 76.24 - mkdir -p $fs/usr/lib 76.25 - cp -a $install/usr/lib/*.*a $fs/usr/lib 76.26 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 76.27 - cp -a $install/usr/include $fs/usr 76.28 + cook_copy_files *.h *.a *.la *.pc 76.29 }
77.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 77.2 +++ b/libmtp/description.txt Fri Apr 21 14:48:05 2017 +0300 77.3 @@ -0,0 +1,2 @@ 77.4 +libmtp is a LGPL library implementation of the Media Transfer Protocol (MTP), 77.5 +a superset of the Picture Transfer Protocol (PTP).
78.1 --- a/libmtp/receipt Sat Apr 15 16:06:43 2017 +0300 78.2 +++ b/libmtp/receipt Fri Apr 21 14:48:05 2017 +0300 78.3 @@ -1,31 +1,37 @@ 78.4 # SliTaz package receipt. 78.5 78.6 PACKAGE="libmtp" 78.7 -VERSION="1.1.6" 78.8 +VERSION="1.1.13" 78.9 CATEGORY="system-tools" 78.10 -SHORT_DESC="LGPL library implementation of the Media Transfer Protocol (MTP)" 78.11 +SHORT_DESC="Access to MTP devices: mp3 players, Android phones" 78.12 MAINTAINER="keupont@no-log.org" 78.13 LICENSE="LGPL2.1" 78.14 WEB_SITE="http://libmtp.sourceforge.net/" 78.15 + 78.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 78.17 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 78.18 78.19 -DEPENDS="libusb udev" 78.20 -BUILD_DEPENDS="libusb-dev" 78.21 +DEPENDS="eudev libgcrypt libgpg-error libusb" 78.22 +BUILD_DEPENDS="libusb-dev libgcrypt-dev" 78.23 78.24 # Rules to configure and make the package. 78.25 compile_rules() 78.26 { 78.27 - ./configure --disable-mtpz $CONFIGURE_ARGS && 78.28 - make && make install 78.29 + ./configure \ 78.30 + --with-udev=/etc/udev \ 78.31 + $CONFIGURE_ARGS && 78.32 + make && make install && 78.33 + 78.34 + # udev rules in /etc/udev/rules.d/; udev execs in /lib/udev/ 78.35 + mkdir -p $install/lib/udev && 78.36 + mv $install/etc/udev/mtp-probe $install/lib/udev && 78.37 + sed -i 's#/etc/udev/mtp-probe#/lib/udev/mtp-probe#' \ 78.38 + $install/etc/udev/rules.d/69-libmtp.rules 78.39 } 78.40 78.41 # Rules to gen a SliTaz package suitable for Tazpkg. 78.42 genpkg_rules() 78.43 { 78.44 - mkdir -p $fs/usr/lib $fs/etc/udev 78.45 - 78.46 - cp -a $install/usr/lib/*.so* $fs/usr/lib 78.47 - cp -a $install/lib/udev/rules.d $fs/etc/udev 78.48 + cook_copy_folders udev 78.49 + cook_copy_files *.so* 78.50 } 78.51 -
79.1 --- a/libmysqlclient/receipt Sat Apr 15 16:06:43 2017 +0300 79.2 +++ b/libmysqlclient/receipt Fri Apr 21 14:48:05 2017 +0300 79.3 @@ -6,10 +6,10 @@ 79.4 SHORT_DESC="SQL database system client libraries." 79.5 MAINTAINER="pascal.bellard@slitaz.org" 79.6 LICENSE="GPL2" 79.7 -WEB_SITE="http://www.mysql.com/" 79.8 +WEB_SITE="https://www.mysql.com/" 79.9 + 79.10 WANTED="mysql" 79.11 - 79.12 -DEPENDS="zlib" 79.13 +DEPENDS="libcrypto libssl zlib" 79.14 79.15 # Rules to gen a SliTaz package suitable for Tazpkg. 79.16 genpkg_rules() 79.17 @@ -17,4 +17,3 @@ 79.18 mkdir -p $fs/usr/lib 79.19 cp -a $install/usr/lib/libmysqlclient*so* $fs/usr/lib 79.20 } 79.21 -
80.1 --- a/libpostgresqlclient/receipt Sat Apr 15 16:06:43 2017 +0300 80.2 +++ b/libpostgresqlclient/receipt Fri Apr 21 14:48:05 2017 +0300 80.3 @@ -1,22 +1,17 @@ 80.4 # SliTaz package receipt. 80.5 80.6 PACKAGE="libpostgresqlclient" 80.7 -VERSION="9.2.3" 80.8 +VERSION="9.5.4" 80.9 CATEGORY="misc" 80.10 -SHORT_DESC="SQL database system libraries." 80.11 +SHORT_DESC="Advanced object-relational database management system (client libraries)" 80.12 MAINTAINER="pascal.bellard@slitaz.org" 80.13 LICENSE="BSD" 80.14 -WEB_SITE="http://www.postgresql.org/" 80.15 +WEB_SITE="https://www.postgresql.org/" 80.16 + 80.17 WANTED="postgresql" 80.18 80.19 # Rules to gen a SliTaz package suitable for Tazpkg. 80.20 genpkg_rules() 80.21 { 80.22 - while read file; do 80.23 - dir=$(dirname $file) 80.24 - [ -d $fs$dir ] || mkdir -p $fs$dir 80.25 - cp -a $install$file $fs$file 80.26 - done < $wanted_stuff/$PACKAGE.files-list 80.27 - ln -s /usr/lib/postgresql/libpq.so.5 $fs/usr/lib/libpq.so.5 80.28 + cook_copy_files libpq.so* 80.29 } 80.30 -
81.1 --- a/libraw-dev/receipt Sat Apr 15 16:06:43 2017 +0300 81.2 +++ b/libraw-dev/receipt Fri Apr 21 14:48:05 2017 +0300 81.3 @@ -1,21 +1,18 @@ 81.4 # SliTaz package receipt. 81.5 81.6 PACKAGE="libraw-dev" 81.7 -VERSION="0.14.7" 81.8 +VERSION="0.17.2" 81.9 CATEGORY="development" 81.10 -SHORT_DESC="devel files for libraw" 81.11 +SHORT_DESC="Raw image decoder library (development files)" 81.12 MAINTAINER="slaxemulator@gmail.com" 81.13 LICENSE="LGPL2.1" 81.14 -WEB_SITE="http://www.libraw.org/" 81.15 +WEB_SITE="https://www.libraw.org/" 81.16 + 81.17 WANTED="libraw" 81.18 - 81.19 -DEPENDS="libraw lcms-dev pkg-config" 81.20 +DEPENDS="libraw jasper-dev libjpeg-turbo-dev lcms2-dev" 81.21 81.22 # Rules to gen a SliTaz package suitable for Tazpkg. 81.23 genpkg_rules() 81.24 { 81.25 - mkdir -p $fs/usr/lib 81.26 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 81.27 - cp -a $install/usr/include $fs/usr 81.28 - cp -a $install/usr/lib/*.*a $fs/usr/lib 81.29 + cook_copy_files *.h *.la *.pc 81.30 }
82.1 --- a/libraw/receipt Sat Apr 15 16:06:43 2017 +0300 82.2 +++ b/libraw/receipt Fri Apr 21 14:48:05 2017 +0300 82.3 @@ -1,24 +1,31 @@ 82.4 # SliTaz package receipt. 82.5 82.6 PACKAGE="libraw" 82.7 -VERSION="0.14.7" 82.8 -CATEGORY="multimedia" 82.9 -SHORT_DESC="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" 82.10 +VERSION="0.17.2" 82.11 +CATEGORY="graphics" 82.12 +SHORT_DESC="Raw image decoder library" 82.13 MAINTAINER="slaxemulator@gmail.com" 82.14 LICENSE="LGPL2.1" 82.15 -WEB_SITE="http://www.libraw.org/" 82.16 -SOURCE="LibRaw" 82.17 -TARBALL="$SOURCE-$VERSION.tar.gz" 82.18 +WEB_SITE="https://www.libraw.org/" 82.19 + 82.20 +TARBALL="LibRaw-$VERSION.tar.gz" 82.21 WGET_URL="http://www.libraw.org/data/$TARBALL" 82.22 82.23 -DEPENDS="lcms" 82.24 -BUILD_DEPENDS="lcms-dev" 82.25 +DEPENDS="jasper lcms2 libgomp libjpeg-turbo" 82.26 +BUILD_DEPENDS="libjpeg-turbo-dev lcms2-dev jasper-dev" 82.27 82.28 # Rules to configure and make the package. 82.29 compile_rules() 82.30 { 82.31 - cd $src 82.32 - ./configure $CONFIGURE_ARGS && make && make install 82.33 + CXX="g++ -Wno-narrowing" \ 82.34 + ./configure \ 82.35 + --enable-jpeg \ 82.36 + --enable-jasper \ 82.37 + --enable-lcms \ 82.38 + --disable-static \ 82.39 + --docdir=/usr/share/doc/libraw-$VERSION \ 82.40 + $CONFIGURE_ARGS && 82.41 + make && make install 82.42 } 82.43 82.44 # Rules to gen a SliTaz package suitable for Tazpkg.
83.1 --- a/libsoup-dev/receipt Sat Apr 15 16:06:43 2017 +0300 83.2 +++ b/libsoup-dev/receipt Fri Apr 21 14:48:05 2017 +0300 83.3 @@ -1,30 +1,20 @@ 83.4 # SliTaz package receipt. 83.5 83.6 PACKAGE="libsoup-dev" 83.7 -VERSION="2.48.0" 83.8 -CATEGORY="x-window" 83.9 -SHORT_DESC="GNOME Soup Library (devel files)." 83.10 +VERSION="2.54.1" 83.11 +CATEGORY="development" 83.12 +SHORT_DESC="HTTP client/server library for GNOME (development files)" 83.13 MAINTAINER="pankso@slitaz.org" 83.14 LICENSE="LGPL2" 83.15 -WANTED="libsoup" 83.16 -WEB_SITE="http://live.gnome.org/LibSoup/" 83.17 +WEB_SITE="https://wiki.gnome.org/Projects/libsoup" 83.18 HOST_ARCH="i486 arm" 83.19 83.20 -DEPENDS="libsoup libsoup-gnome libxml2-dev gnutls-dev glib-dev pkg-config" 83.21 +WANTED="libsoup" 83.22 +DEPENDS="libsoup glib-dev glibc-dev libffi-dev libgio-dev liblzma-dev libxml2-dev \ 83.23 +pcre-dev sqlite-dev zlib-dev" 83.24 83.25 # Rules to gen a SliTaz package suitable for Tazpkg. 83.26 genpkg_rules() 83.27 { 83.28 - mkdir -p $fs/usr/lib $fs/usr/share 83.29 - 83.30 - cp -a $install/usr/lib/*.*a $fs/usr/lib 83.31 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 83.32 - 83.33 - if [ -d "$install/usr/share/gir-1.0" ]; then 83.34 - cp -a $install/usr/share/gir-1.0 $fs/usr/share 83.35 - cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib 83.36 - fi 83.37 - 83.38 - cp -a $install/usr/include $fs/usr 83.39 + cook_copy_files *.h *.la *.pc *.typelib *.gir *.vapi *.deps 83.40 } 83.41 -
84.1 --- a/libsoup-gnome/receipt Sat Apr 15 16:06:43 2017 +0300 84.2 +++ b/libsoup-gnome/receipt Fri Apr 21 14:48:05 2017 +0300 84.3 @@ -1,21 +1,19 @@ 84.4 # SliTaz package receipt. 84.5 84.6 PACKAGE="libsoup-gnome" 84.7 -VERSION="2.48.0" 84.8 +VERSION="2.54.1" 84.9 CATEGORY="x-window" 84.10 -SHORT_DESC="GNOME Soup Library." 84.11 +SHORT_DESC="HTTP clien/server library for GNOME (GNOME specific library)" 84.12 MAINTAINER="al.bobylev@gmail.com" 84.13 LICENSE="LGPL2" 84.14 -WEB_SITE="https://live.gnome.org/LibSoup/" 84.15 +WEB_SITE="https://wiki.gnome.org/Projects/libsoup" 84.16 HOST_ARCH="i486 arm" 84.17 84.18 -DEPENDS="libsoup libgnome-keyring libsqlite" 84.19 WANTED="libsoup" 84.20 +DEPENDS="glib libffi libgio liblzma libsoup libsqlite libxml2 pcre zlib" 84.21 84.22 # Rules to gen a SliTaz package suitable for Tazpkg. 84.23 genpkg_rules() 84.24 { 84.25 - mkdir -p $fs/usr/lib 84.26 - 84.27 - cp -a $install/usr/lib/libsoup-gnome*.so* $fs/usr/lib 84.28 + cook_copy_files libsoup-gnome*.so* 84.29 }
85.1 --- a/libsoup/receipt Sat Apr 15 16:06:43 2017 +0300 85.2 +++ b/libsoup/receipt Fri Apr 21 14:48:05 2017 +0300 85.3 @@ -1,32 +1,35 @@ 85.4 # SliTaz package receipt. 85.5 85.6 PACKAGE="libsoup" 85.7 -VERSION="2.48.0" 85.8 -CATEGORY="x-window" 85.9 -SHORT_DESC="GNOME Soup Library." 85.10 +VERSION="2.54.1" 85.11 +CATEGORY="network" 85.12 +SHORT_DESC="HTTP client/server library for GNOME" 85.13 MAINTAINER="pankso@slitaz.org" 85.14 LICENSE="LGPL2" 85.15 -TARBALL="$PACKAGE-$VERSION.tar.xz" 85.16 -WEB_SITE="https://live.gnome.org/LibSoup/" 85.17 -WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 85.18 +WEB_SITE="https://wiki.gnome.org/Projects/libsoup" 85.19 HOST_ARCH="i486 arm" 85.20 85.21 +TARBALL="$PACKAGE-$VERSION.tar.xz" 85.22 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 85.23 + 85.24 DEPENDS="glib glibc-base libffi libgio libxml2 pcre zlib" 85.25 -BUILD_DEPENDS="glib-networking-dev libgio-dev \ 85.26 +BUILD_DEPENDS_arm="glib-networking-dev libgio-dev \ 85.27 libxml2-dev libgcrypt-dev libtasn1-dev gnutls-dev zlib-dev \ 85.28 libgnome-keyring-dev sqlite-dev dbus-dev" 85.29 +BUILD_DEPENDS="glib-dev libxml2-dev sqlite-dev intltool gtk-doc \ 85.30 +gobject-introspection-dev vala glib-networking-dev" 85.31 +SPLIT="libsoup-gnome libsoup-dev" 85.32 85.33 # Handle cross compilation. 85.34 case "$ARCH" in 85.35 - i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;; 85.36 + arm) BUILD_DEPENDS=$BUILD_DEPENDS_arm ;; 85.37 esac 85.38 85.39 # Rules to configure and make the package. 85.40 compile_rules() 85.41 { 85.42 ./configure \ 85.43 - --with-html-dir=/usr/share/doc \ 85.44 - --disable-gtk-doc \ 85.45 + --disable-static \ 85.46 $CONFIGURE_ARGS && 85.47 make && make install 85.48 } 85.49 @@ -34,9 +37,5 @@ 85.50 # Rules to gen a SliTaz package suitable for Tazpkg. 85.51 genpkg_rules() 85.52 { 85.53 - mkdir -p $fs/usr/lib 85.54 - cp -a $install/usr/lib/*.so* $fs/usr/lib 85.55 - 85.56 - # move to libsoup-gnome package 85.57 - rm -f $fs/usr/lib/libsoup-gnome* 85.58 + cook_copy_files libsoup-2*.so* 85.59 }
86.1 --- a/libtasn1-dev/receipt Sat Apr 15 16:06:43 2017 +0300 86.2 +++ b/libtasn1-dev/receipt Fri Apr 21 14:48:05 2017 +0300 86.3 @@ -1,22 +1,19 @@ 86.4 # SliTaz package receipt. 86.5 86.6 PACKAGE="libtasn1-dev" 86.7 -VERSION="4.5" 86.8 +VERSION="4.9" 86.9 CATEGORY="development" 86.10 -SHORT_DESC="The libtasn1 devel files." 86.11 +SHORT_DESC="Library for ASN.1 and DER manipulation (development files)" 86.12 MAINTAINER="pankso@slitaz.org" 86.13 LICENSE="GPL3 LGPL2.1" 86.14 -WANTED="libtasn1" 86.15 -WEB_SITE="http://www.gnu.org/software/libtasn1/" 86.16 +WEB_SITE="https://www.gnu.org/software/libtasn1/" 86.17 HOST_ARCH="i486 arm" 86.18 86.19 -DEPENDS="libtasn1 pkg-config" 86.20 +WANTED="libtasn1" 86.21 +DEPENDS="libtasn1" 86.22 86.23 # Rules to gen a SliTaz package suitable for Tazpkg. 86.24 genpkg_rules() 86.25 { 86.26 - mkdir -p $fs/usr/lib 86.27 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 86.28 - cp -a $install/usr/lib/*.*a $fs/usr/lib 86.29 - cp -a $install/usr/include $fs/usr 86.30 + cook_copy_files *.h *.la *.pc 86.31 }
87.1 --- a/libtasn1/receipt Sat Apr 15 16:06:43 2017 +0300 87.2 +++ b/libtasn1/receipt Fri Apr 21 14:48:05 2017 +0300 87.3 @@ -1,28 +1,34 @@ 87.4 # SliTaz package receipt. 87.5 87.6 PACKAGE="libtasn1" 87.7 -VERSION="4.5" 87.8 +VERSION="4.9" 87.9 CATEGORY="security" 87.10 -SHORT_DESC="ASN.1 library." 87.11 +SHORT_DESC="Library for ASN.1 and DER manipulation" 87.12 MAINTAINER="pankso@slitaz.org" 87.13 LICENSE="GPL3 LGPL2.1" 87.14 +WEB_SITE="https://www.gnu.org/software/libtasn1/" 87.15 +HOST_ARCH="i486 arm" 87.16 + 87.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 87.18 -WEB_SITE="http://www.gnu.org/software/libtasn1/" 87.19 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 87.20 -HOST_ARCH="i486 arm" 87.21 87.22 # Rules to configure and make the package. 87.23 compile_rules() 87.24 { 87.25 + # Package failed to build when optimized for size 87.26 + export CFLAGS=${CFLAGS/-Os/-O2} 87.27 + 87.28 ./configure \ 87.29 + --disable-static \ 87.30 $CONFIGURE_ARGS && 87.31 make && make install 87.32 + 87.33 + make -C doc/reference install-data-local 87.34 } 87.35 87.36 # Rules to gen a SliTaz package suitable for Tazpkg. 87.37 genpkg_rules() 87.38 { 87.39 - mkdir -p $fs/usr/lib 87.40 - cp -a $install/usr/bin $fs/usr 87.41 - cp -a $install/usr/lib/*.so* $fs/usr/lib 87.42 + cook_copy_folders bin 87.43 + cook_copy_files *.so* 87.44 }
88.1 --- a/libunique-dev/receipt Sat Apr 15 16:06:43 2017 +0300 88.2 +++ b/libunique-dev/receipt Fri Apr 21 14:48:05 2017 +0300 88.3 @@ -3,24 +3,21 @@ 88.4 PACKAGE="libunique-dev" 88.5 VERSION="1.1.6" 88.6 CATEGORY="development" 88.7 -SHORT_DESC="Development files for Libunique." 88.8 +SHORT_DESC="Library for writing single instance application (development files)" 88.9 MAINTAINER="erjo@slitaz.org" 88.10 LICENSE="LGPL2.1" 88.11 -WEB_SITE="http://live.gnome.org/LibUnique" 88.12 -WANTED="libunique" 88.13 +WEB_SITE="https://wiki.gnome.org/Attic/LibUnique" 88.14 HOST_ARCH="i486 arm" 88.15 88.16 -DEPENDS="libunique pkg-config" 88.17 +WANTED="libunique" 88.18 +DEPENDS="libunique atk-dev bzip2-dev cairo-dev fontconfig-dev freetype-dev \ 88.19 +gdk-pixbuf-dev glib-dev glibc-dev gtk+-dev harfbuzz-dev libffi-dev libgio-dev \ 88.20 +liblzma-dev libpng-dev libxcb-dev libxml2-dev pango-dev pcre-dev pixman-dev \ 88.21 +xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 88.22 +xorg-libXrender-dev zlib-dev" 88.23 88.24 # Rules to gen a SliTaz package suitable for Tazpkg. 88.25 genpkg_rules() 88.26 { 88.27 - mkdir -p $fs/usr/lib $fs/usr/share 88.28 - [ -d "$install/usr/share/gir-1.0" ] && \ 88.29 - cp -a $install/usr/share/gir-1.0 $fs/usr/share 88.30 - [ -d "$install/usr/lib/girepository-1.0" ] && \ 88.31 - cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib 88.32 - cp -a $install/usr/include $fs/usr 88.33 - cp -a $install/usr/lib/*.*a $fs/usr/lib 88.34 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 88.35 + cook_copy_files *.h *.la *.pc *.typelib *.gir 88.36 }
89.1 --- a/libunique/receipt Sat Apr 15 16:06:43 2017 +0300 89.2 +++ b/libunique/receipt Fri Apr 21 14:48:05 2017 +0300 89.3 @@ -3,29 +3,35 @@ 89.4 PACKAGE="libunique" 89.5 VERSION="1.1.6" 89.6 CATEGORY="development" 89.7 -SHORT_DESC="Library for writing single instance application." 89.8 +SHORT_DESC="Library for writing single instance application" 89.9 MAINTAINER="erjo@slitaz.org" 89.10 LICENSE="LGPL2.1" 89.11 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 89.12 -WEB_SITE="http://live.gnome.org/LibUnique" 89.13 -WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 89.14 +WEB_SITE="https://wiki.gnome.org/Attic/LibUnique" 89.15 HOST_ARCH="i486 arm" 89.16 89.17 -DEPENDS="cairo gtk+" 89.18 -BUILD_DEPENDS="cairo-dev gtk+-dev glib-dev expat-dev" 89.19 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 89.20 +WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 89.21 + 89.22 +DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ harfbuzz \ 89.23 +libffi libgio liblzma libpng libxcb libxml2 pango pcre pixman xorg-libX11 \ 89.24 +xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib" 89.25 +BUILD_DEPENDS="automake glib-dev gettext libtool gtk+-dev xorg-libICE-dev \ 89.26 +gobject-introspection-dev gtk-doc" 89.27 +BUILD_DEPENDS_arm="cairo-dev gtk+-dev glib-dev expat-dev" 89.28 89.29 case "$ARCH" in 89.30 - i?86) 89.31 - BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev perl" 89.32 - export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable" 89.33 + arm*) BUILD_DEPENDS="$BUILD_DEPENDS_arm";; 89.34 esac 89.35 89.36 # Rules to configure and make the package. 89.37 compile_rules() 89.38 { 89.39 - patch -Np1 -i $stuff/remove_G_CONST_RETURN.patch || return 1 89.40 + while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series 89.41 + 89.42 + autoreconf -fi && 89.43 ./configure \ 89.44 --disable-dbus \ 89.45 + --disable-static \ 89.46 $CONFIGURE_ARGS && 89.47 make && make install 89.48 } 89.49 @@ -33,7 +39,5 @@ 89.50 # Rules to gen a SliTaz package suitable for Tazpkg. 89.51 genpkg_rules() 89.52 { 89.53 - mkdir -p $fs/usr/lib 89.54 - cp -a $install/usr/lib/*.so* $fs/usr/lib 89.55 + cook_copy_files *.so* 89.56 } 89.57 -
90.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 90.2 +++ b/libunique/stuff/patches/libunique-1.1.6-upstream_fixes-1.patch Fri Apr 21 14:48:05 2017 +0300 90.3 @@ -0,0 +1,1036 @@ 90.4 +Submitted By: Armin K. <krejzi at email dot com> 90.5 +Date: 2013-03-16 90.6 +Initial Package Version: 1.1.6 90.7 +Upstream Status: In Upstream VCS 90.8 +Origin: Upstream VCS 90.9 +Description: Varius fixes from upstream including build system fixes, compilation 90.10 + fixes and new GDBus backend. 90.11 + 90.12 +--- a/build/autotools/introspection.m4 2009-09-21 14:31:14.000000000 +0200 90.13 ++++ b/build/autotools/introspection.m4 2013-03-16 23:47:50.178671206 +0100 90.14 +@@ -59,12 +59,18 @@ 90.15 + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` 90.16 + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` 90.17 + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" 90.18 ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` 90.19 ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` 90.20 ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection 90.21 + fi 90.22 + AC_SUBST(INTROSPECTION_SCANNER) 90.23 + AC_SUBST(INTROSPECTION_COMPILER) 90.24 + AC_SUBST(INTROSPECTION_GENERATE) 90.25 + AC_SUBST(INTROSPECTION_GIRDIR) 90.26 + AC_SUBST(INTROSPECTION_TYPELIBDIR) 90.27 ++ AC_SUBST(INTROSPECTION_CFLAGS) 90.28 ++ AC_SUBST(INTROSPECTION_LIBS) 90.29 ++ AC_SUBST(INTROSPECTION_MAKEFILE) 90.30 + 90.31 + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") 90.32 + ]) 90.33 +--- a/build/autotools/Makefile.am 2009-11-01 18:52:21.000000000 +0100 90.34 ++++ b/build/autotools/Makefile.am 2013-03-16 23:47:50.178671206 +0100 90.35 +@@ -1,7 +1,4 @@ 90.36 + EXTRA_DIST = \ 90.37 +- shave-libtool.in \ 90.38 +- shave.in \ 90.39 +- shave.m4 \ 90.40 + as-compiler-flag.m4 \ 90.41 + introspection.m4 \ 90.42 + Makefile.am.enums \ 90.43 +--- a/build/autotools/Makefile.am.silent 2009-11-01 19:00:57.000000000 +0100 90.44 ++++ b/build/autotools/Makefile.am.silent 2013-03-16 23:47:50.178671206 +0100 90.45 +@@ -1,10 +1,5 @@ 90.46 + # custom rules for quiet builds 90.47 + 90.48 +-if USE_SHAVE 90.49 +-QUIET_GEN = $(Q:@=@echo ' GEN '$@;) 90.50 +-QUIET_LN = $(Q:@=@echo ' LN '$@;) 90.51 +-QUIET_RM = $(Q:@=@echo ' RM '$@;) 90.52 +-else 90.53 + QUIET_GEN = $(AM_V_GEN) 90.54 + 90.55 + QUIET_LN = $(QUIET_LN_$(V)) 90.56 +@@ -14,4 +9,3 @@ 90.57 + QUIET_RM = $(QUIET_RM_$(V)) 90.58 + QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY)) 90.59 + QUIET_RM_0 = @echo ' RM '$@; 90.60 +-endif # USE_SHAVE 90.61 +--- a/build/autotools/shave.in 2009-09-21 14:31:14.000000000 +0200 90.62 ++++ b/build/autotools/shave.in 1970-01-01 01:00:00.000000000 +0100 90.63 +@@ -1,79 +0,0 @@ 90.64 +-#!/bin/sh 90.65 +- 90.66 +-# we need sed 90.67 +-SED=@SED@ 90.68 +-if test -z "$SED" ; then 90.69 +-SED=sed 90.70 +-fi 90.71 +- 90.72 +-lt_unmangle () 90.73 +-{ 90.74 +- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` 90.75 +-} 90.76 +- 90.77 +-# the tool to wrap (cc, cxx, ar, ranlib, ..) 90.78 +-tool="$1" 90.79 +-shift 90.80 +- 90.81 +-# the reel tool (to call) 90.82 +-REEL_TOOL="$1" 90.83 +-shift 90.84 +- 90.85 +-pass_through=0 90.86 +-preserved_args= 90.87 +-while test "$#" -gt 0; do 90.88 +- opt="$1" 90.89 +- shift 90.90 +- 90.91 +- case $opt in 90.92 +- --shave-mode=*) 90.93 +- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` 90.94 +- ;; 90.95 +- -o) 90.96 +- lt_output="$1" 90.97 +- preserved_args="$preserved_args $opt" 90.98 +- ;; 90.99 +- *) 90.100 +- preserved_args="$preserved_args $opt" 90.101 +- ;; 90.102 +- esac 90.103 +-done 90.104 +- 90.105 +-# mode=link is handled in the libtool wrapper 90.106 +-case "$mode,$tool" in 90.107 +-link,*) 90.108 +- pass_through=1 90.109 +- ;; 90.110 +-*,cxx) 90.111 +- Q=" CXX " 90.112 +- ;; 90.113 +-*,cc) 90.114 +- Q=" CC " 90.115 +- ;; 90.116 +-*,fc) 90.117 +- Q=" FC " 90.118 +- ;; 90.119 +-*,f77) 90.120 +- Q=" F77 " 90.121 +- ;; 90.122 +-*,objc) 90.123 +- Q=" OBJC " 90.124 +- ;; 90.125 +-*,*) 90.126 +- # should not happen 90.127 +- Q=" CC " 90.128 +- ;; 90.129 +-esac 90.130 +- 90.131 +-lt_unmangle "$lt_output" 90.132 +-output=$last_result 90.133 +- 90.134 +-if test -z $V; then 90.135 +- if test $pass_through -eq 0; then 90.136 +- echo "$Q$output" 90.137 +- fi 90.138 +- $REEL_TOOL $preserved_args 90.139 +-else 90.140 +- echo $REEL_TOOL $preserved_args 90.141 +- $REEL_TOOL $preserved_args 90.142 +-fi 90.143 +--- a/build/autotools/shave-libtool.in 2009-09-21 14:31:14.000000000 +0200 90.144 ++++ b/build/autotools/shave-libtool.in 1970-01-01 01:00:00.000000000 +0100 90.145 +@@ -1,69 +0,0 @@ 90.146 +-#!/bin/sh 90.147 +- 90.148 +-# we need sed 90.149 +-SED=@SED@ 90.150 +-if test -z "$SED" ; then 90.151 +-SED=sed 90.152 +-fi 90.153 +- 90.154 +-lt_unmangle () 90.155 +-{ 90.156 +- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` 90.157 +-} 90.158 +- 90.159 +-# the real libtool to use 90.160 +-LIBTOOL="$1" 90.161 +-shift 90.162 +- 90.163 +-# if 1, don't print anything, the underlaying wrapper will do it 90.164 +-pass_though=0 90.165 +- 90.166 +-# scan the arguments, keep the right ones for libtool, and discover the mode 90.167 +-preserved_args= 90.168 +-while test "$#" -gt 0; do 90.169 +- opt="$1" 90.170 +- shift 90.171 +- 90.172 +- case $opt in 90.173 +- --mode=*) 90.174 +- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` 90.175 +- preserved_args="$preserved_args $opt" 90.176 +- ;; 90.177 +- -o) 90.178 +- lt_output="$1" 90.179 +- preserved_args="$preserved_args $opt" 90.180 +- ;; 90.181 +- *) 90.182 +- preserved_args="$preserved_args $opt" 90.183 +- ;; 90.184 +- esac 90.185 +-done 90.186 +- 90.187 +-case "$mode" in 90.188 +-compile) 90.189 +- # shave will be called and print the actual CC/CXX/LINK line 90.190 +- preserved_args="$preserved_args --shave-mode=$mode" 90.191 +- pass_though=1 90.192 +- ;; 90.193 +-link) 90.194 +- preserved_args="$preserved_args --shave-mode=$mode" 90.195 +- Q=" LINK " 90.196 +- ;; 90.197 +-*) 90.198 +- # let's u 90.199 +- # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" 90.200 +- ;; 90.201 +-esac 90.202 +- 90.203 +-lt_unmangle "$lt_output" 90.204 +-output=$last_result 90.205 +- 90.206 +-if test -z $V; then 90.207 +- if test $pass_though -eq 0; then 90.208 +- echo "$Q$output" 90.209 +- fi 90.210 +- $LIBTOOL --silent $preserved_args 90.211 +-else 90.212 +- echo $LIBTOOL $preserved_args 90.213 +- $LIBTOOL $preserved_args 90.214 +-fi 90.215 +--- a/build/autotools/shave.m4 2009-09-21 14:31:14.000000000 +0200 90.216 ++++ b/build/autotools/shave.m4 1970-01-01 01:00:00.000000000 +0100 90.217 +@@ -1,77 +0,0 @@ 90.218 +-dnl Make automake/libtool output more friendly to humans 90.219 +-dnl Damien Lespiau <damien.lespiau@gmail.com> 90.220 +-dnl 90.221 +-dnl SHAVE_INIT([shavedir],[default_mode]) 90.222 +-dnl 90.223 +-dnl shavedir: the directory where the shave scripts are, it defaults to 90.224 +-dnl $(top_builddir) 90.225 +-dnl default_mode: (enable|disable) default shave mode. This parameter 90.226 +-dnl controls shave's behaviour when no option has been 90.227 +-dnl given to configure. It defaults to disable. 90.228 +-dnl 90.229 +-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just 90.230 +-dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and 90.231 +-dnl LIBTOOL, you don't want the configure tests to have these variables 90.232 +-dnl re-defined. 90.233 +-dnl * This macro requires GNU make's -s option. 90.234 +- 90.235 +-AC_DEFUN([_SHAVE_ARG_ENABLE], 90.236 +-[ 90.237 +- AC_ARG_ENABLE([shave], 90.238 +- AS_HELP_STRING( 90.239 +- [--enable-shave], 90.240 +- [use shave to make the build pretty [[default=$1]]]),, 90.241 +- [enable_shave=$1] 90.242 +- ) 90.243 +-]) 90.244 +- 90.245 +-AC_DEFUN([SHAVE_INIT], 90.246 +-[ 90.247 +- dnl you can tweak the default value of enable_shave 90.248 +- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) 90.249 +- 90.250 +- if test x"$enable_shave" = xyes; then 90.251 +- dnl where can we find the shave scripts? 90.252 +- m4_if([$1],, 90.253 +- [shavedir="$ac_pwd"], 90.254 +- [shavedir="$ac_pwd/$1"]) 90.255 +- AC_SUBST(shavedir) 90.256 +- 90.257 +- dnl make is now quiet 90.258 +- AC_SUBST([MAKEFLAGS], [-s]) 90.259 +- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) 90.260 +- 90.261 +- dnl we need sed 90.262 +- AC_CHECK_PROG(SED,sed,sed,false) 90.263 +- 90.264 +- dnl substitute libtool 90.265 +- SHAVE_SAVED_LIBTOOL=$LIBTOOL 90.266 +- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" 90.267 +- AC_SUBST(LIBTOOL) 90.268 +- 90.269 +- dnl substitute cc/cxx 90.270 +- SHAVE_SAVED_CC=$CC 90.271 +- SHAVE_SAVED_CXX=$CXX 90.272 +- SHAVE_SAVED_FC=$FC 90.273 +- SHAVE_SAVED_F77=$F77 90.274 +- SHAVE_SAVED_OBJC=$OBJC 90.275 +- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" 90.276 +- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" 90.277 +- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" 90.278 +- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" 90.279 +- OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" 90.280 +- AC_SUBST(CC) 90.281 +- AC_SUBST(CXX) 90.282 +- AC_SUBST(FC) 90.283 +- AC_SUBST(F77) 90.284 +- AC_SUBST(OBJC) 90.285 +- 90.286 +- V=@ 90.287 +- else 90.288 +- V=1 90.289 +- fi 90.290 +- Q='$(V:1=)' 90.291 +- AC_SUBST(V) 90.292 +- AC_SUBST(Q) 90.293 +-]) 90.294 +- 90.295 +--- a/configure.ac 2009-11-12 14:57:39.000000000 +0100 90.296 ++++ b/configure.ac 2013-03-16 23:48:53.856423651 +0100 90.297 +@@ -14,7 +14,7 @@ 90.298 + # This is the X.Y used in the protocol negotiation 90.299 + m4_define([unique_protocol_version], [1.0]) 90.300 + 90.301 +-AC_PREREQ([2.59]) 90.302 ++AC_PREREQ([2.63]) 90.303 + 90.304 + AC_INIT([unique], [unique_version], 90.305 + [http://bugzilla.gnome.org/enter_bug.cgi?product=libunique], 90.306 +@@ -23,8 +23,20 @@ 90.307 + AC_CONFIG_SRCDIR([unique/unique.h]) 90.308 + AC_CONFIG_MACRO_DIR([build/autotools]) 90.309 + 90.310 +-AM_INIT_AUTOMAKE([1.10]) 90.311 +-AM_CONFIG_HEADER([config.h]) 90.312 ++AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2]) 90.313 ++AC_CONFIG_HEADERS([config.h]) 90.314 ++ 90.315 ++AM_SILENT_RULES([yes]) 90.316 ++ 90.317 ++AC_PROG_CC_C_O 90.318 ++ 90.319 ++AM_PATH_GLIB_2_0 90.320 ++ 90.321 ++LT_PREREQ([2.2]) 90.322 ++LT_INIT([disable-static]) 90.323 ++ 90.324 ++# Honor aclocal flags 90.325 ++ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" 90.326 + 90.327 + # version symbols 90.328 + UNIQUE_MAJOR_VERSION=unique_major_version 90.329 +@@ -49,21 +61,6 @@ 90.330 + AC_SUBST(UNIQUE_LT_VERSION_INFO) 90.331 + AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE) 90.332 + 90.333 +-AC_ISC_POSIX 90.334 +-AC_PROG_CC 90.335 +-AC_PROG_INSTALL 90.336 +-AC_PROG_MAKE_SET 90.337 +-AC_C_CONST 90.338 +-AC_PROG_LIBTOOL 90.339 +-AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) 90.340 +-AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) 90.341 +- 90.342 +-AM_SANITY_CHECK 90.343 +-AM_PROG_CC_STDC 90.344 +- 90.345 +-# Honor aclocal flags 90.346 +-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" 90.347 +- 90.348 + m4_define([glib_required], [2.12.0]) 90.349 + m4_define([gtk_required], [2.11.0]) 90.350 + m4_define([dbus_required], [0.70]) 90.351 +@@ -119,10 +116,22 @@ 90.352 + 90.353 + AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) 90.354 + 90.355 ++dnl GDBus backend 90.356 ++dnl This is the default backend if GIO is recent enough 90.357 ++m4_define([gdbus_gio_required],[2.25.7]) 90.358 ++PKG_CHECK_MODULES([GDBUS],[gio-2.0 >= gdbus_gio_required],[have_gdbus=yes],[have_gdbus=no]) 90.359 ++ 90.360 ++AS_IF([test "x$have_gdbus" = "xyes"], 90.361 ++ [ 90.362 ++ AC_DEFINE([HAVE_GDBUS],[1],[Define if GDBus backend is enabled]) 90.363 ++ ] 90.364 ++ ) 90.365 ++ 90.366 ++AM_CONDITIONAL([HAVE_GDBUS],[test "$have_gdbus" = "yes"]) 90.367 ++ 90.368 + dnl Bacon backend 90.369 + dnl This is the fallback backend, so we *need* these headers and functions 90.370 + dnl even if we end up using D-Bus 90.371 +-dnl D-Bus backend dependencies 90.372 + m4_define([have_bacon_default], [yes]) 90.373 + AC_ARG_ENABLE([bacon], 90.374 + [AC_HELP_STRING([--enable-bacon=@<:@yes/no@:>@], 90.375 +@@ -150,7 +159,13 @@ 90.376 + 90.377 + dnl Choose the default backend 90.378 + AC_MSG_CHECKING([for default IPC mechanism]) 90.379 +-AS_IF([test "x$have_dbus" = "xyes"], 90.380 ++AS_IF([test "x$have_gdbus" = "xyes"], 90.381 ++ [ 90.382 ++ UNIQUE_DEFAULT_BACKEND=gdbus 90.383 ++ AC_MSG_RESULT([GDBus]) 90.384 ++ ], 90.385 ++ 90.386 ++ [test "x$have_dbus" = "xyes"], 90.387 + [ 90.388 + UNIQUE_DEFAULT_BACKEND=dbus 90.389 + AC_MSG_RESULT([D-Bus]) 90.390 +@@ -178,9 +193,9 @@ 90.391 + AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"], 90.392 + [ 90.393 + AS_COMPILER_FLAGS([MAINTAINER_CFLAGS], 90.394 +- ["-Werror -Wall -Wshadow -Wcast-align 90.395 +- -Wno-uninitialized -Wempty-body -Wformat-security 90.396 +- -Winit-self"]) 90.397 ++ ["-Wall -Wshadow -Wcast-align 90.398 ++ -Wno-uninitialized -Wempty-body 90.399 ++ -Wformat-security -Winit-self"]) 90.400 + ] 90.401 + ) 90.402 + 90.403 +@@ -230,27 +245,10 @@ 90.404 + AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR) 90.405 + 90.406 + # introspection 90.407 +-GOBJECT_INTROSPECTION_CHECK([0.6.3]) 90.408 ++GOBJECT_INTROSPECTION_CHECK([0.6.7]) 90.409 + 90.410 + # gtk-doc 90.411 +-GTK_DOC_CHECK([1.11]) 90.412 +- 90.413 +-# nice builds 90.414 +-m4_ifdef([AM_SILENT_RULES], 90.415 +- [ 90.416 +- AM_SILENT_RULES([yes]) 90.417 +- use_shave=no 90.418 +- ], 90.419 +- [ 90.420 +- SHAVE_INIT([build/autotools], [enable]) 90.421 +- AC_CONFIG_FILES([ 90.422 +- build/autotools/shave-libtool 90.423 +- build/autotools/shave 90.424 +- ]) 90.425 +- use_shave=yes 90.426 +- ]) 90.427 +- 90.428 +-AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"]) 90.429 ++GTK_DOC_CHECK([1.13]) 90.430 + 90.431 + AC_CONFIG_FILES([ 90.432 + Makefile 90.433 +@@ -264,6 +262,7 @@ 90.434 + unique/uniqueversion.h 90.435 + unique/bacon/Makefile 90.436 + unique/dbus/Makefile 90.437 ++ unique/gdbus/Makefile 90.438 + tests/Makefile 90.439 + po/Makefile.in 90.440 + ]) 90.441 +@@ -282,6 +281,7 @@ 90.442 + Backends: 90.443 + Unix Domain Socket: $have_bacon 90.444 + D-BUS: $have_dbus 90.445 ++ GDBus: $have_gdbus 90.446 + 90.447 + Default backend: $UNIQUE_DEFAULT_BACKEND 90.448 + " 90.449 +--- a/doc/reference/Makefile.am 2009-09-21 14:31:14.000000000 +0200 90.450 ++++ b/doc/reference/Makefile.am 2013-03-16 23:48:20.572522852 +0100 90.451 +@@ -50,7 +50,8 @@ 90.452 + uniquemarshal.h \ 90.453 + stamp-uniquemarshal.h \ 90.454 + bacon \ 90.455 +- dbus 90.456 ++ dbus \ 90.457 ++ gdbus 90.458 + 90.459 + EXTRA_HFILES = 90.460 + 90.461 +--- a/unique/dbus/uniquebackend-dbus.c 2009-11-01 20:15:26.000000000 +0100 90.462 ++++ b/unique/dbus/uniquebackend-dbus.c 2013-03-16 23:48:03.088891381 +0100 90.463 +@@ -84,7 +84,6 @@ 90.464 + static gboolean 90.465 + unique_backend_dbus_request_name (UniqueBackend *backend) 90.466 + { 90.467 +- UniqueBackendDBus *backend_dbus; 90.468 + const gchar *name; 90.469 + DBusGConnection *connection; 90.470 + DBusGProxy *proxy; 90.471 +@@ -97,8 +96,6 @@ 90.472 + if (!connection) 90.473 + return FALSE; 90.474 + 90.475 +- backend_dbus = UNIQUE_BACKEND_DBUS (backend); 90.476 +- 90.477 + retval = TRUE; 90.478 + name = unique_backend_get_name (backend); 90.479 + g_assert (name != NULL); 90.480 +@@ -207,10 +204,14 @@ 90.481 + cmd, data, time_, 90.482 + &resp, 90.483 + &error); 90.484 +- if (error) 90.485 ++ if (!res) 90.486 + { 90.487 +- g_warning ("Error while sending message: %s", error->message); 90.488 +- g_error_free (error); 90.489 ++ if (error) 90.490 ++ { 90.491 ++ g_warning ("Error while sending message: %s", error->message); 90.492 ++ g_error_free (error); 90.493 ++ } 90.494 ++ 90.495 + g_free (cmd); 90.496 + 90.497 + return UNIQUE_RESPONSE_INVALID; 90.498 +--- a/unique/gdbus/.gitignore 1970-01-01 01:00:00.000000000 +0100 90.499 ++++ b/unique/gdbus/.gitignore 2013-03-16 23:48:20.572522852 +0100 90.500 +@@ -0,0 +1,2 @@ 90.501 ++libunique_gdbus_la-uniquebackend-gdbus.lo 90.502 ++libunique-gdbus.la 90.503 +--- a/unique/gdbus/Makefile.am 1970-01-01 01:00:00.000000000 +0100 90.504 ++++ b/unique/gdbus/Makefile.am 2013-03-16 23:48:20.572522852 +0100 90.505 +@@ -0,0 +1,24 @@ 90.506 ++include $(top_srcdir)/build/autotools/Makefile.am.silent 90.507 ++ 90.508 ++noinst_LTLIBRARIES = libunique-gdbus.la 90.509 ++ 90.510 ++libunique_gdbus_la_SOURCES = \ 90.511 ++ uniquebackend-gdbus.h \ 90.512 ++ uniquebackend-gdbus.c 90.513 ++ 90.514 ++libunique_gdbus_la_PPCFLAGS = \ 90.515 ++ -DG_LOG_DOMAIN=\"Unique-GDBus\" \ 90.516 ++ -DG_DISABLE_SINGLE_INCLUDES \ 90.517 ++ -I$(top_srcdir) \ 90.518 ++ $(AM_CPPFLAGS) 90.519 ++ 90.520 ++libunique_gdbus_la_CFLAGS = \ 90.521 ++ $(UNIQUE_CFLAGS) \ 90.522 ++ $(UNIQUE_DEBUG_CFLAGS) \ 90.523 ++ $(MAINTAINER_CFLAGS) \ 90.524 ++ $(GDBUS_CFLAGS) \ 90.525 ++ $(AM_CFLAGS) 90.526 ++ 90.527 ++libunique_gdbus_la_LIBADD = \ 90.528 ++ $(UNIQUE_LIBS) \ 90.529 ++ $(GDBUS_LIBS) 90.530 +--- a/unique/gdbus/uniquebackend-gdbus.c 1970-01-01 01:00:00.000000000 +0100 90.531 ++++ b/unique/gdbus/uniquebackend-gdbus.c 2013-03-16 23:48:20.575856242 +0100 90.532 +@@ -0,0 +1,303 @@ 90.533 ++/* Unique - Single Instance application library 90.534 ++ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend 90.535 ++ * 90.536 ++ * Copyright (C) 2007 Emmanuele Bassi <ebassi@o-hand.com> 90.537 ++ * Copyright © 2010 Christian Persch 90.538 ++ * 90.539 ++ * This library is free software; you can redistribute it and/or 90.540 ++ * modify it under the terms of the GNU Lesser General Public 90.541 ++ * License as published by the Free Software Foundation; either 90.542 ++ * version 2.1 of the License, or (at your option) any later version. 90.543 ++ * 90.544 ++ * This library is distributed in the hope that it will be useful, 90.545 ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of 90.546 ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 90.547 ++ * Lesser General Public License for more details. 90.548 ++ * 90.549 ++ * You should have received a copy of the GNU Lesser General Public 90.550 ++ * License along with this library; if not, write to the Free Software 90.551 ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 90.552 ++ * 02110-1301 USA 90.553 ++ */ 90.554 ++ 90.555 ++#ifdef HAVE_CONFIG_H 90.556 ++#include "config.h" 90.557 ++#endif 90.558 ++ 90.559 ++#include <gio/gio.h> 90.560 ++#include <gdk/gdk.h> 90.561 ++ 90.562 ++#include "../uniqueinternals.h" 90.563 ++#include "uniquebackend-gdbus.h" 90.564 ++ 90.565 ++struct _UniqueBackendGDBus 90.566 ++{ 90.567 ++ UniqueBackend parent_instance; 90.568 ++ 90.569 ++ GDBusConnection *connection; 90.570 ++ guint registration_id; 90.571 ++ guint owner_id; 90.572 ++ gboolean owns_name; 90.573 ++ GMainLoop *loop; 90.574 ++}; 90.575 ++ 90.576 ++struct _UniqueBackendGDBusClass 90.577 ++{ 90.578 ++ UniqueBackendClass parent_class; 90.579 ++ GDBusNodeInfo *introspection_data; 90.580 ++}; 90.581 ++ 90.582 ++G_DEFINE_TYPE (UniqueBackendGDBus, unique_backend_gdbus, UNIQUE_TYPE_BACKEND); 90.583 ++ 90.584 ++static const char introspection_xml[] = 90.585 ++ "<node name='/'>" 90.586 ++ "<interface name='org.gtk.UniqueApp'>" 90.587 ++ "<method name='SendMessage'>" 90.588 ++ "<arg name='command' type='s' direction='in'/>" 90.589 ++ "<arg name='message' type='(suuus)' direction='in'/>" 90.590 ++ "<arg name='time' type='u' direction='in'/>" 90.591 ++ "<arg name='response' type='s' direction='out'/>" 90.592 ++ "</method>" 90.593 ++ "</interface>" 90.594 ++ "</node>"; 90.595 ++ 90.596 ++static void 90.597 ++method_call_cb (GDBusConnection *connection, 90.598 ++ const gchar *sender, 90.599 ++ const gchar *object_path, 90.600 ++ const gchar *interface_name, 90.601 ++ const gchar *method_name, 90.602 ++ GVariant *parameters, 90.603 ++ GDBusMethodInvocation *invocation, 90.604 ++ gpointer user_data) 90.605 ++{ 90.606 ++ if (g_strcmp0 (interface_name, "org.gtk.UniqueApp") != 0 || 90.607 ++ g_strcmp0 (object_path, "/Factory") != 0) 90.608 ++ return; 90.609 ++ 90.610 ++ if (g_strcmp0 (method_name, "SendMessage") == 0) 90.611 ++ { 90.612 ++ UniqueBackend *backend = UNIQUE_BACKEND (user_data); 90.613 ++ const gchar *command_str, *data, *startup_id; 90.614 ++ guint len, screen_num, workspace, time_; 90.615 ++ UniqueMessageData message_data; 90.616 ++ gint command; 90.617 ++ UniqueResponse response; 90.618 ++ GdkDisplay *display; 90.619 ++ 90.620 ++ g_variant_get (parameters, 90.621 ++ "(&s(&suuu&s)u)", 90.622 ++ &command_str, 90.623 ++ &data, &len, &screen_num, &workspace, &startup_id, 90.624 ++ &time_); 90.625 ++ 90.626 ++ command = unique_command_from_string (backend->parent, command_str); 90.627 ++ if (command == 0) 90.628 ++ { 90.629 ++ g_dbus_method_invocation_return_error (invocation, 90.630 ++ G_DBUS_ERROR, 90.631 ++ G_DBUS_ERROR_INVALID_ARGS, 90.632 ++ "Invalid command `%s' received", 90.633 ++ command_str); 90.634 ++ return; 90.635 ++ } 90.636 ++ 90.637 ++ display = gdk_display_get_default (); 90.638 ++ 90.639 ++ message_data.data = len > 0 ? (guchar *) data : NULL; 90.640 ++ message_data.length = (gint) len; 90.641 ++ message_data.workspace = workspace; 90.642 ++ message_data.startup_id = (char *) startup_id; 90.643 ++ if (screen_num >= 0 && screen_num < gdk_display_get_n_screens (display)) 90.644 ++ message_data.screen = gdk_display_get_screen (display, screen_num); 90.645 ++ else 90.646 ++ message_data.screen = gdk_screen_get_default (); 90.647 ++ 90.648 ++ response = unique_app_emit_message_received (backend->parent, command, &message_data, time_); 90.649 ++ 90.650 ++ g_dbus_method_invocation_return_value (invocation, 90.651 ++ g_variant_new ("(s)", unique_response_to_string (response))); 90.652 ++ return; 90.653 ++ } 90.654 ++} 90.655 ++ 90.656 ++static void 90.657 ++name_acquired_cb (GDBusConnection *connection, 90.658 ++ const gchar *name, 90.659 ++ gpointer user_data) 90.660 ++{ 90.661 ++ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); 90.662 ++ 90.663 ++ backend_gdbus->owns_name = TRUE; 90.664 ++ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) 90.665 ++ g_main_loop_quit (backend_gdbus->loop); 90.666 ++} 90.667 ++ 90.668 ++static void 90.669 ++name_lost_cb (GDBusConnection *connection, 90.670 ++ const gchar *name, 90.671 ++ gpointer user_data) 90.672 ++{ 90.673 ++ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); 90.674 ++ 90.675 ++ backend_gdbus->owns_name = FALSE; 90.676 ++ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) 90.677 ++ g_main_loop_quit (backend_gdbus->loop); 90.678 ++} 90.679 ++ 90.680 ++static const GDBusInterfaceVTable interface_vtable = { 90.681 ++ method_call_cb, 90.682 ++ NULL, 90.683 ++ NULL 90.684 ++}; 90.685 ++ 90.686 ++static gboolean 90.687 ++unique_backend_gdbus_request_name (UniqueBackend *backend) 90.688 ++{ 90.689 ++ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); 90.690 ++ UniqueBackendGDBusClass *klass = UNIQUE_BACKEND_GDBUS_GET_CLASS (backend); 90.691 ++ GError *error; 90.692 ++ 90.693 ++ error = NULL; 90.694 ++ backend_gdbus->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); 90.695 ++ if (!backend_gdbus->connection) 90.696 ++ { 90.697 ++ g_warning ("Unable to open a connection to the session bus: %s", 90.698 ++ error->message); 90.699 ++ g_error_free (error); 90.700 ++ 90.701 ++ return FALSE; 90.702 ++ } 90.703 ++ 90.704 ++ backend_gdbus->registration_id = 90.705 ++ g_dbus_connection_register_object (backend_gdbus->connection, 90.706 ++ "/Factory", 90.707 ++ klass->introspection_data->interfaces[0], 90.708 ++ &interface_vtable, 90.709 ++ backend, NULL, 90.710 ++ &error); 90.711 ++ if (backend_gdbus->registration_id == 0) 90.712 ++ { 90.713 ++ g_warning ("Unable to register object with the session bus: %s", 90.714 ++ error->message); 90.715 ++ g_error_free (error); 90.716 ++ 90.717 ++ return FALSE; 90.718 ++ } 90.719 ++ 90.720 ++ backend_gdbus->owns_name = FALSE; 90.721 ++ 90.722 ++ backend_gdbus->owner_id = 90.723 ++ g_bus_own_name_on_connection (backend_gdbus->connection, 90.724 ++ unique_backend_get_name (backend), 90.725 ++ G_BUS_NAME_OWNER_FLAGS_NONE, 90.726 ++ name_acquired_cb, 90.727 ++ name_lost_cb, 90.728 ++ backend, NULL); 90.729 ++ 90.730 ++ backend_gdbus->loop = g_main_loop_new (NULL, FALSE); 90.731 ++ g_main_loop_run (backend_gdbus->loop); 90.732 ++ g_main_loop_unref (backend_gdbus->loop); 90.733 ++ backend_gdbus->loop = NULL; 90.734 ++ 90.735 ++ return backend_gdbus->owns_name; 90.736 ++} 90.737 ++ 90.738 ++static UniqueResponse 90.739 ++unique_backend_gdbus_send_message (UniqueBackend *backend, 90.740 ++ gint command, 90.741 ++ UniqueMessageData *message_data, 90.742 ++ guint time_) 90.743 ++{ 90.744 ++ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); 90.745 ++ GVariantBuilder builder; 90.746 ++ GVariant *result; 90.747 ++ const gchar *command_str, *resp; 90.748 ++ UniqueResponse response; 90.749 ++ GError *error; 90.750 ++ 90.751 ++ command_str = unique_command_to_string (backend->parent, command); 90.752 ++ 90.753 ++ g_variant_builder_init (&builder, G_VARIANT_TYPE ("(s(suuus)u)")); 90.754 ++ g_variant_builder_add (&builder, "s", command_str ? command_str : ""); 90.755 ++ g_variant_builder_open (&builder, G_VARIANT_TYPE ("(suuus)")); 90.756 ++ g_variant_builder_add (&builder, "s", message_data->data ? (char *) message_data->data : ""); 90.757 ++ g_variant_builder_add (&builder, "u", (guint) message_data->length); 90.758 ++ g_variant_builder_add (&builder, "u", (guint) gdk_screen_get_number (message_data->screen)); 90.759 ++ g_variant_builder_add (&builder, "u", (guint) message_data->workspace); 90.760 ++ g_variant_builder_add (&builder, "s", message_data->startup_id ? message_data->startup_id : ""); 90.761 ++ g_variant_builder_close (&builder); 90.762 ++ g_variant_builder_add (&builder, "u", time_); 90.763 ++ 90.764 ++ error = NULL; 90.765 ++ result = g_dbus_connection_call_sync (backend_gdbus->connection, 90.766 ++ unique_backend_get_name (backend), 90.767 ++ "/Factory", 90.768 ++ "org.gtk.UniqueApp", 90.769 ++ "SendMessage", 90.770 ++ g_variant_builder_end (&builder), 90.771 ++ G_VARIANT_TYPE ("(s)"), 90.772 ++ G_DBUS_CALL_FLAGS_NO_AUTO_START, 90.773 ++ -1, 90.774 ++ NULL, 90.775 ++ &error); 90.776 ++ if (error) 90.777 ++ { 90.778 ++ g_warning ("Error while sending message: %s", error->message); 90.779 ++ g_error_free (error); 90.780 ++ 90.781 ++ return UNIQUE_RESPONSE_INVALID; 90.782 ++ } 90.783 ++ 90.784 ++ g_variant_get (result, "(&s)", &resp); 90.785 ++ response = unique_response_from_string (resp); 90.786 ++ g_variant_unref (result); 90.787 ++ 90.788 ++ return response; 90.789 ++} 90.790 ++ 90.791 ++static void 90.792 ++unique_backend_gdbus_dispose (GObject *gobject) 90.793 ++{ 90.794 ++ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (gobject); 90.795 ++ 90.796 ++ if (backend_gdbus->owner_id != 0) 90.797 ++ { 90.798 ++ g_bus_unown_name (backend_gdbus->owner_id); 90.799 ++ backend_gdbus->owner_id = 0; 90.800 ++ } 90.801 ++ if (backend_gdbus->registration_id != 0) 90.802 ++ { 90.803 ++ g_assert (backend_gdbus->connection != NULL); 90.804 ++ g_dbus_connection_unregister_object (backend_gdbus->connection, 90.805 ++ backend_gdbus->registration_id); 90.806 ++ backend_gdbus->registration_id = 0; 90.807 ++ } 90.808 ++ if (backend_gdbus->connection) 90.809 ++ { 90.810 ++ g_object_unref (backend_gdbus->connection); 90.811 ++ backend_gdbus->connection = NULL; 90.812 ++ } 90.813 ++ 90.814 ++ G_OBJECT_CLASS (unique_backend_gdbus_parent_class)->dispose (gobject); 90.815 ++} 90.816 ++ 90.817 ++static void 90.818 ++unique_backend_gdbus_class_init (UniqueBackendGDBusClass *klass) 90.819 ++{ 90.820 ++ GObjectClass *gobject_class = G_OBJECT_CLASS (klass); 90.821 ++ UniqueBackendClass *backend_class = UNIQUE_BACKEND_CLASS (klass); 90.822 ++ 90.823 ++ gobject_class->dispose = unique_backend_gdbus_dispose; 90.824 ++ 90.825 ++ backend_class->request_name = unique_backend_gdbus_request_name; 90.826 ++ backend_class->send_message = unique_backend_gdbus_send_message; 90.827 ++ 90.828 ++ klass->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); 90.829 ++ g_assert (klass->introspection_data != NULL); 90.830 ++} 90.831 ++ 90.832 ++static void 90.833 ++unique_backend_gdbus_init (UniqueBackendGDBus *backend) 90.834 ++{ 90.835 ++} 90.836 +--- a/unique/gdbus/uniquebackend-gdbus.h 1970-01-01 01:00:00.000000000 +0100 90.837 ++++ b/unique/gdbus/uniquebackend-gdbus.h 2013-03-16 23:48:20.575856242 +0100 90.838 +@@ -0,0 +1,43 @@ 90.839 ++/* Unique - Single Instance application library 90.840 ++ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend 90.841 ++ * 90.842 ++ * Copyright (C) 2007 Emmanuele Bassi <ebassi@o-hand.com> 90.843 ++ * 90.844 ++ * This library is free software; you can redistribute it and/or 90.845 ++ * modify it under the terms of the GNU Lesser General Public 90.846 ++ * License as published by the Free Software Foundation; either 90.847 ++ * version 2.1 of the License, or (at your option) any later version. 90.848 ++ * 90.849 ++ * This library is distributed in the hope that it will be useful, 90.850 ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of 90.851 ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 90.852 ++ * Lesser General Public License for more details. 90.853 ++ * 90.854 ++ * You should have received a copy of the GNU Lesser General Public 90.855 ++ * License along with this library; if not, write to the Free Software 90.856 ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 90.857 ++ * 02110-1301 USA 90.858 ++ */ 90.859 ++ 90.860 ++#ifndef __UNIQUE_BACKEND_GDBUS_H__ 90.861 ++#define __UNIQUE_BACKEND_GDBUS_H__ 90.862 ++ 90.863 ++#include <unique/uniquebackend.h> 90.864 ++ 90.865 ++G_BEGIN_DECLS 90.866 ++ 90.867 ++#define UNIQUE_TYPE_BACKEND_GDBUS (unique_backend_gdbus_get_type ()) 90.868 ++#define UNIQUE_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBus)) 90.869 ++#define UNIQUE_IS_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNIQUE_TYPE_BACKEND_GDBUS)) 90.870 ++#define UNIQUE_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) 90.871 ++#define UNIQUE_IS_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNIQUE_TYPE_BACKEND_GDBUS)) 90.872 ++#define UNIQUE_BACKEND_GDBUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) 90.873 ++ 90.874 ++typedef struct _UniqueBackendGDBus UniqueBackendGDBus; 90.875 ++typedef struct _UniqueBackendGDBusClass UniqueBackendGDBusClass; 90.876 ++ 90.877 ++GType unique_backend_gdbus_get_type (void) G_GNUC_CONST; 90.878 ++ 90.879 ++G_END_DECLS 90.880 ++ 90.881 ++#endif /* __UNIQUE_BACKEND_GDBUS_H__ */ 90.882 +--- a/unique/Makefile.am 2009-11-12 14:53:10.000000000 +0100 90.883 ++++ b/unique/Makefile.am 2013-03-16 23:48:20.572522852 +0100 90.884 +@@ -12,7 +12,11 @@ 90.885 + SUBDIRS += dbus 90.886 + endif 90.887 + 90.888 +-DIST_SUBDIRS = bacon dbus 90.889 ++if HAVE_GDBUS 90.890 ++SUBDIRS += gdbus 90.891 ++endif 90.892 ++ 90.893 ++DIST_SUBDIRS = bacon dbus gdbus 90.894 + 90.895 + INCLUDES = -I$(top_srcdir) 90.896 + 90.897 +@@ -72,6 +76,10 @@ 90.898 + unique_backend_libs += $(top_builddir)/unique/dbus/libunique-dbus.la 90.899 + endif 90.900 + 90.901 ++if HAVE_GDBUS 90.902 ++unique_backend_libs += $(top_builddir)/unique/gdbus/libunique-gdbus.la 90.903 ++endif 90.904 ++ 90.905 + uniquedir = $(includedir)/unique-1.0/unique 90.906 + unique_HEADERS = \ 90.907 + $(unique_sources_h) \ 90.908 +--- a/unique/uniqueapp.c 2009-11-01 19:33:13.000000000 +0100 90.909 ++++ b/unique/uniqueapp.c 2013-03-16 23:49:05.236617643 +0100 90.910 +@@ -781,7 +781,7 @@ 90.911 + } 90.912 + 90.913 + 90.914 +-G_CONST_RETURN gchar * 90.915 ++const gchar * 90.916 + unique_command_to_string (UniqueApp *app, 90.917 + gint command) 90.918 + { 90.919 +@@ -863,7 +863,7 @@ 90.920 + return retval; 90.921 + } 90.922 + 90.923 +-G_CONST_RETURN gchar * 90.924 ++const gchar * 90.925 + unique_response_to_string (UniqueResponse response) 90.926 + { 90.927 + GEnumClass *enum_class; 90.928 +--- a/unique/uniquebackend.c 2009-11-09 12:02:06.000000000 +0100 90.929 ++++ b/unique/uniquebackend.c 2013-03-16 23:49:05.236617643 +0100 90.930 +@@ -111,7 +111,7 @@ 90.931 + * 90.932 + * Return value: FIXME 90.933 + */ 90.934 +-G_CONST_RETURN gchar * 90.935 ++const gchar * 90.936 + unique_backend_get_name (UniqueBackend *backend) 90.937 + { 90.938 + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); 90.939 +@@ -154,7 +154,7 @@ 90.940 + * 90.941 + * Return value: FIXME 90.942 + */ 90.943 +-G_CONST_RETURN gchar * 90.944 ++const gchar * 90.945 + unique_backend_get_startup_id (UniqueBackend *backend) 90.946 + { 90.947 + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); 90.948 +@@ -298,6 +298,9 @@ 90.949 + #ifdef HAVE_DBUS 90.950 + #include "dbus/uniquebackend-dbus.h" 90.951 + #endif 90.952 ++#ifdef HAVE_GDBUS 90.953 ++#include "gdbus/uniquebackend-gdbus.h" 90.954 ++#endif 90.955 + 90.956 + /** 90.957 + * unique_backend_create: 90.958 +@@ -329,6 +332,10 @@ 90.959 + if (strcmp (backend_name, "dbus") == 0) 90.960 + backend_gtype = unique_backend_dbus_get_type (); 90.961 + #endif /* HAVE_DBUS */ 90.962 ++#ifdef HAVE_GDBUS 90.963 ++ if (strcmp (backend_name, "gdbus") == 0) 90.964 ++ backend_gtype = unique_backend_gdbus_get_type (); 90.965 ++#endif /* HAVE_GDBUS */ 90.966 + #if !defined(HAVE_BACON) && !defined(HAVE_DBUS) 90.967 + #error Need either bacon or dbus 90.968 + #endif 90.969 +--- a/unique/uniquebackend.h 2009-09-21 14:31:14.000000000 +0200 90.970 ++++ b/unique/uniquebackend.h 2013-03-16 23:49:05.236617643 +0100 90.971 +@@ -94,10 +94,10 @@ 90.972 + 90.973 + UniqueBackend * unique_backend_create (void); 90.974 + 90.975 +-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); 90.976 ++const gchar *unique_backend_get_name (UniqueBackend *backend); 90.977 + void unique_backend_set_name (UniqueBackend *backend, 90.978 + const gchar *name); 90.979 +-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); 90.980 ++const gchar *unique_backend_get_startup_id (UniqueBackend *backend); 90.981 + void unique_backend_set_startup_id (UniqueBackend *backend, 90.982 + const gchar *startup_id); 90.983 + GdkScreen * unique_backend_get_screen (UniqueBackend *backend); 90.984 +--- a/unique/uniqueinternals.h 2009-09-21 14:31:14.000000000 +0200 90.985 ++++ b/unique/uniqueinternals.h 2013-03-16 23:49:05.236617643 +0100 90.986 +@@ -44,11 +44,11 @@ 90.987 + * and then back into an id 90.988 + */ 90.989 + UniqueResponse unique_response_from_string (const gchar *response); 90.990 +-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); 90.991 ++const gchar *unique_response_to_string (UniqueResponse response); 90.992 + 90.993 + gint unique_command_from_string (UniqueApp *app, 90.994 + const gchar *command); 90.995 +-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, 90.996 ++const gchar *unique_command_to_string (UniqueApp *app, 90.997 + gint command); 90.998 + 90.999 + G_END_DECLS 90.1000 +--- a/unique/uniquemessage.c 2009-11-09 12:02:06.000000000 +0100 90.1001 ++++ b/unique/uniquemessage.c 2013-03-16 23:49:05.236617643 +0100 90.1002 +@@ -185,7 +185,7 @@ 90.1003 + * 90.1004 + * Since: 1.0.2 90.1005 + */ 90.1006 +-G_CONST_RETURN guchar * 90.1007 ++const guchar * 90.1008 + unique_message_data_get (UniqueMessageData *message_data, 90.1009 + gsize *length) 90.1010 + { 90.1011 +@@ -525,7 +525,7 @@ 90.1012 + * owned by the #UniqueMessageData structure and should not be 90.1013 + * modified or freed 90.1014 + */ 90.1015 +-G_CONST_RETURN gchar * 90.1016 ++const gchar * 90.1017 + unique_message_data_get_startup_id (UniqueMessageData *message_data) 90.1018 + { 90.1019 + g_return_val_if_fail (message_data != NULL, NULL); 90.1020 +--- a/unique/uniquemessage.h 2009-09-21 14:31:14.000000000 +0200 90.1021 ++++ b/unique/uniquemessage.h 2013-03-16 23:49:05.236617643 +0100 90.1022 +@@ -48,7 +48,7 @@ 90.1023 + void unique_message_data_set (UniqueMessageData *message_data, 90.1024 + const guchar *data, 90.1025 + gsize length); 90.1026 +-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, 90.1027 ++const guchar *unique_message_data_get (UniqueMessageData *message_data, 90.1028 + gsize *length); 90.1029 + 90.1030 + gboolean unique_message_data_set_text (UniqueMessageData *message_data, 90.1031 +@@ -63,7 +63,7 @@ 90.1032 + gchar * unique_message_data_get_filename (UniqueMessageData *message_data); 90.1033 + 90.1034 + GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); 90.1035 +-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); 90.1036 ++const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); 90.1037 + guint unique_message_data_get_workspace (UniqueMessageData *message_data); 90.1038 + 90.1039 + G_END_DECLS
91.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 91.2 +++ b/libunique/stuff/patches/series Fri Apr 21 14:48:05 2017 +0300 91.3 @@ -0,0 +1,1 @@ 91.4 +libunique-1.1.6-upstream_fixes-1.patch
92.1 --- a/libunique/stuff/remove_G_CONST_RETURN.patch Sat Apr 15 16:06:43 2017 +0300 92.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 92.3 @@ -1,117 +0,0 @@ 92.4 -diff -Nur libunique-1.1.6.orig/unique/uniqueapp.c libunique-1.1.6/unique/uniqueapp.c 92.5 ---- libunique-1.1.6.orig/unique/uniqueapp.c 2011-12-01 07:38:17.748122298 +0000 92.6 -+++ libunique-1.1.6/unique/uniqueapp.c 2011-12-01 07:39:59.132319788 +0000 92.7 -@@ -781,7 +781,7 @@ 92.8 - } 92.9 - 92.10 - 92.11 --G_CONST_RETURN gchar * 92.12 -+const gchar * 92.13 - unique_command_to_string (UniqueApp *app, 92.14 - gint command) 92.15 - { 92.16 -@@ -863,7 +863,7 @@ 92.17 - return retval; 92.18 - } 92.19 - 92.20 --G_CONST_RETURN gchar * 92.21 -+const gchar * 92.22 - unique_response_to_string (UniqueResponse response) 92.23 - { 92.24 - GEnumClass *enum_class; 92.25 -diff -Nur libunique-1.1.6.orig/unique/uniquebackend.c libunique-1.1.6/unique/uniquebackend.c 92.26 ---- libunique-1.1.6.orig/unique/uniquebackend.c 2011-12-01 07:38:17.748122298 +0000 92.27 -+++ libunique-1.1.6/unique/uniquebackend.c 2011-12-01 07:39:24.418677950 +0000 92.28 -@@ -111,7 +111,7 @@ 92.29 - * 92.30 - * Return value: FIXME 92.31 - */ 92.32 --G_CONST_RETURN gchar * 92.33 -+const gchar * 92.34 - unique_backend_get_name (UniqueBackend *backend) 92.35 - { 92.36 - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); 92.37 -@@ -154,7 +154,7 @@ 92.38 - * 92.39 - * Return value: FIXME 92.40 - */ 92.41 --G_CONST_RETURN gchar * 92.42 -+const gchar * 92.43 - unique_backend_get_startup_id (UniqueBackend *backend) 92.44 - { 92.45 - g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); 92.46 -diff -Nur libunique-1.1.6.orig/unique/uniquebackend.h libunique-1.1.6/unique/uniquebackend.h 92.47 ---- libunique-1.1.6.orig/unique/uniquebackend.h 2011-12-01 07:38:17.748122298 +0000 92.48 -+++ libunique-1.1.6/unique/uniquebackend.h 2011-12-01 07:42:13.833467492 +0000 92.49 -@@ -94,10 +94,10 @@ 92.50 - 92.51 - UniqueBackend * unique_backend_create (void); 92.52 - 92.53 --G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); 92.54 -+const gchar *unique_backend_get_name (UniqueBackend *backend); 92.55 - void unique_backend_set_name (UniqueBackend *backend, 92.56 - const gchar *name); 92.57 --G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); 92.58 -+const gchar *unique_backend_get_startup_id (UniqueBackend *backend); 92.59 - void unique_backend_set_startup_id (UniqueBackend *backend, 92.60 - const gchar *startup_id); 92.61 - GdkScreen * unique_backend_get_screen (UniqueBackend *backend); 92.62 -diff -Nur libunique-1.1.6.orig/unique/uniqueinternals.h libunique-1.1.6/unique/uniqueinternals.h 92.63 ---- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-12-01 07:38:17.748122298 +0000 92.64 -+++ libunique-1.1.6/unique/uniqueinternals.h 2011-12-01 07:41:17.142977914 +0000 92.65 -@@ -44,11 +44,11 @@ 92.66 - * and then back into an id 92.67 - */ 92.68 - UniqueResponse unique_response_from_string (const gchar *response); 92.69 --G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); 92.70 -+const gchar *unique_response_to_string (UniqueResponse response); 92.71 - 92.72 - gint unique_command_from_string (UniqueApp *app, 92.73 - const gchar *command); 92.74 --G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, 92.75 -+const gchar *unique_command_to_string (UniqueApp *app, 92.76 - gint command); 92.77 - 92.78 - G_END_DECLS 92.79 -diff -Nur libunique-1.1.6.orig/unique/uniquemessage.c libunique-1.1.6/unique/uniquemessage.c 92.80 ---- libunique-1.1.6.orig/unique/uniquemessage.c 2011-12-01 07:38:17.748122298 +0000 92.81 -+++ libunique-1.1.6/unique/uniquemessage.c 2011-12-01 07:41:45.743225713 +0000 92.82 -@@ -185,7 +185,7 @@ 92.83 - * 92.84 - * Since: 1.0.2 92.85 - */ 92.86 --G_CONST_RETURN guchar * 92.87 -+const guchar * 92.88 - unique_message_data_get (UniqueMessageData *message_data, 92.89 - gsize *length) 92.90 - { 92.91 -@@ -525,7 +525,7 @@ 92.92 - * owned by the #UniqueMessageData structure and should not be 92.93 - * modified or freed 92.94 - */ 92.95 --G_CONST_RETURN gchar * 92.96 -+const gchar * 92.97 - unique_message_data_get_startup_id (UniqueMessageData *message_data) 92.98 - { 92.99 - g_return_val_if_fail (message_data != NULL, NULL); 92.100 -diff -Nur libunique-1.1.6.orig/unique/uniquemessage.h libunique-1.1.6/unique/uniquemessage.h 92.101 ---- libunique-1.1.6.orig/unique/uniquemessage.h 2011-12-01 07:38:17.748122298 +0000 92.102 -+++ libunique-1.1.6/unique/uniquemessage.h 2011-12-01 07:40:47.576064565 +0000 92.103 -@@ -48,7 +48,7 @@ 92.104 - void unique_message_data_set (UniqueMessageData *message_data, 92.105 - const guchar *data, 92.106 - gsize length); 92.107 --G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, 92.108 -+const guchar *unique_message_data_get (UniqueMessageData *message_data, 92.109 - gsize *length); 92.110 - 92.111 - gboolean unique_message_data_set_text (UniqueMessageData *message_data, 92.112 -@@ -63,7 +63,7 @@ 92.113 - gchar * unique_message_data_get_filename (UniqueMessageData *message_data); 92.114 - 92.115 - GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); 92.116 --G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); 92.117 -+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); 92.118 - guint unique_message_data_get_workspace (UniqueMessageData *message_data); 92.119 - 92.120 - G_END_DECLS
93.1 --- a/libusb/receipt Sat Apr 15 16:06:43 2017 +0300 93.2 +++ b/libusb/receipt Fri Apr 21 14:48:05 2017 +0300 93.3 @@ -21,7 +21,7 @@ 93.4 ./configure \ 93.5 --disable-static \ 93.6 $CONFIGURE_ARGS && 93.7 - make -j 1 && make install 93.8 + make && make install 93.9 } 93.10 93.11 # Rules to gen a SliTaz package suitable for Tazpkg.
94.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 94.2 +++ b/libwebp-apps/receipt Fri Apr 21 14:48:05 2017 +0300 94.3 @@ -0,0 +1,19 @@ 94.4 +# SliTaz package receipt. 94.5 + 94.6 +PACKAGE="libwebp-apps" 94.7 +VERSION="0.5.1" 94.8 +CATEGORY="x-window" 94.9 +SHORT_DESC="WebP image library (applications)" 94.10 +MAINTAINER="al.bobylev@gmail.com" 94.11 +LICENSE="BSD" 94.12 +WEB_SITE="https://www.webmproject.org/" 94.13 +HOST_ARCH="i486 arm" 94.14 + 94.15 +WANTED="libwebp" 94.16 +DEPENDS="giflib libjpeg-turbo libpng libwebp tiff" 94.17 + 94.18 +# Rules to gen a SliTaz package suitable for Tazpkg. 94.19 +genpkg_rules() 94.20 +{ 94.21 + cook_copy_folders bin 94.22 +}
95.1 --- a/libwebp-dev/receipt Sat Apr 15 16:06:43 2017 +0300 95.2 +++ b/libwebp-dev/receipt Fri Apr 21 14:48:05 2017 +0300 95.3 @@ -1,20 +1,18 @@ 95.4 # SliTaz package receipt. 95.5 95.6 PACKAGE="libwebp-dev" 95.7 -VERSION="0.4.2" 95.8 +VERSION="0.5.1" 95.9 CATEGORY="development" 95.10 -SHORT_DESC="Webp image library devel files." 95.11 +SHORT_DESC="WebP image library (development files)" 95.12 MAINTAINER="pankso@slitaz.org" 95.13 LICENSE="BSD" 95.14 +WEB_SITE="https://www.webmproject.org/" 95.15 +HOST_ARCH="i486 arm" 95.16 + 95.17 WANTED="libwebp" 95.18 -WEB_SITE="http://webmproject.org" 95.19 -HOST_ARCH="i486 arm" 95.20 95.21 # Rules to gen a SliTaz package suitable for Tazpkg. 95.22 genpkg_rules() 95.23 { 95.24 - mkdir -p $fs/usr/lib 95.25 - cp -a $install/usr/lib/*.*a $fs/usr/lib 95.26 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 95.27 - cp -a $install/usr/include $fs/usr 95.28 + cook_copy_files *.h *.la *.pc 95.29 }
96.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 96.2 +++ b/libwebp/description.txt Fri Apr 21 14:48:05 2017 +0300 96.3 @@ -0,0 +1,6 @@ 96.4 +WebP is an image format that uses either the VP8 key frame encoding to compress 96.5 +image data in a lossy way, or the WebP lossless encoding (and possibly other 96.6 +encodings in the future). These encoding schemes should make it more efficient 96.7 +than currently used formats. It is optimized for fast image transfer over the 96.8 +network (e.g., for websites). The WebP format has feature parity (color 96.9 +profile, metadata, animation, etc.) with other formats as well.
97.1 --- a/libwebp/receipt Sat Apr 15 16:06:43 2017 +0300 97.2 +++ b/libwebp/receipt Fri Apr 21 14:48:05 2017 +0300 97.3 @@ -1,32 +1,36 @@ 97.4 # SliTaz package receipt. 97.5 97.6 PACKAGE="libwebp" 97.7 -VERSION="0.4.2" 97.8 +VERSION="0.5.1" 97.9 CATEGORY="x-window" 97.10 SHORT_DESC="WebP image library." 97.11 MAINTAINER="devl547@gmail.com" 97.12 LICENSE="BSD" 97.13 -TARBALL="$PACKAGE-$VERSION.tar.gz" 97.14 -WEB_SITE="http://webmproject.org" 97.15 -WGET_URL="http://downloads.webmproject.org/releases/webp/$TARBALL" 97.16 +WEB_SITE="https://www.webmproject.org/" 97.17 HOST_ARCH="i486 arm" 97.18 97.19 -DEPENDS="" 97.20 -BUILD_DEPENDS="" 97.21 +TARBALL="$PACKAGE-$VERSION.tar.gz" 97.22 +WGET_URL="http://downloads.webmproject.org/releases/webp/$TARBALL" 97.23 + 97.24 +BUILD_DEPENDS="libpng-dev libjpeg-turbo-dev tiff-dev giflib-dev" 97.25 +SPLIT="libwebp-apps libwebp-dev" 97.26 97.27 # Rules to configure and make the package. 97.28 compile_rules() 97.29 { 97.30 - cd $src 97.31 - ./configure --disable-static \ 97.32 - $CONFIGURE_ARGS && 97.33 - make && 97.34 - make DESTDIR=$DESTDIR install 97.35 + ./configure \ 97.36 + --enable-libwebpmux \ 97.37 + --enable-libwebpdemux \ 97.38 + --enable-libwebpdecoder \ 97.39 + --enable-libwebpextras \ 97.40 + --enable-swap-16bit-csp \ 97.41 + --disable-static \ 97.42 + $CONFIGURE_ARGS && 97.43 + make && make install 97.44 } 97.45 97.46 # Rules to gen a SliTaz package suitable for Tazpkg. 97.47 genpkg_rules() 97.48 { 97.49 - mkdir -p $fs/usr/lib 97.50 - cp -a $install/usr/lib/*.so* $fs/usr/lib 97.51 + cook_copy_files *.so* 97.52 }
98.1 --- a/lxmenu-data/receipt Sat Apr 15 16:06:43 2017 +0300 98.2 +++ b/lxmenu-data/receipt Fri Apr 21 14:48:05 2017 +0300 98.3 @@ -1,35 +1,37 @@ 98.4 # SliTaz package receipt. 98.5 98.6 PACKAGE="lxmenu-data" 98.7 -VERSION="0.1.4" 98.8 +VERSION="0.1.5" 98.9 CATEGORY="x-window" 98.10 SHORT_DESC="LXDE freedesktop.org menu specification" 98.11 MAINTAINER="rcx@zoominternet.net" 98.12 LICENSE="GPL2" 98.13 -TARBALL="$PACKAGE-$VERSION.tar.xz" 98.14 -WEB_SITE="http://www.lxde.org/" 98.15 -WGET_URL="$SF_MIRROR/lxde/$TARBALL" 98.16 +WEB_SITE="http://lxde.org/" 98.17 CONFIG_FILES="/etc/xdg/menus/lxde-applications.menu" 98.18 TAGS="LXDE" 98.19 HOST_ARCH="i486 arm" 98.20 98.21 -[ "$ARCH" == "i486" ] && BUILD_DEPENDS="gettext intltool" 98.22 +TARBALL="$PACKAGE-$VERSION.tar.xz" 98.23 +WGET_URL="$SF_MIRROR/lxde/$TARBALL" 98.24 + 98.25 +BUILD_DEPENDS="gettext intltool" 98.26 +BUILD_DEPENDS_arm="" 98.27 + 98.28 +case $ARCH in 98.29 + arm*) BUILD_DEPENDS=$BUILD_DEPENDS_arm;; 98.30 +esac 98.31 98.32 # Rules to configure and make the package. 98.33 compile_rules() 98.34 { 98.35 ./configure \ 98.36 - --prefix=/usr \ 98.37 --sysconfdir=/etc \ 98.38 $CONFIGURE_ARGS && 98.39 - make && 98.40 - make DESTDIR=$DESTDIR install 98.41 + make && make install 98.42 } 98.43 98.44 # Rules to gen a SliTaz package suitable for Tazpkg. 98.45 genpkg_rules() 98.46 { 98.47 - mkdir -p $fs 98.48 - cp -a $install/usr $fs 98.49 - cp -a $install/etc $fs 98.50 + cook_copy_folders etc usr 98.51 }
99.1 --- a/menu-cache-dev/receipt Sat Apr 15 16:06:43 2017 +0300 99.2 +++ b/menu-cache-dev/receipt Fri Apr 21 14:48:05 2017 +0300 99.3 @@ -1,22 +1,20 @@ 99.4 # SliTaz package receipt. 99.5 99.6 PACKAGE="menu-cache-dev" 99.7 -VERSION="1.0.0" 99.8 +VERSION="1.0.2" 99.9 CATEGORY="development" 99.10 -SHORT_DESC="LXDE implementation of the freedesktop Menu's cache (development)" 99.11 +SHORT_DESC="LXDE implementation of the freedesktop menu's cache (development files)" 99.12 MAINTAINER="pankso@slitaz.org" 99.13 LICENSE="GPL2" 99.14 -WEB_SITE="http://lxde.sourceforge.net/" 99.15 -WANTED="menu-cache" 99.16 -DEPENDS="menu-cache pkg-config" 99.17 +WEB_SITE="https://github.com/lxde/menu-cache" 99.18 TAGS="LXDE" 99.19 HOST_ARCH="i486 arm" 99.20 99.21 +WANTED="menu-cache" 99.22 +DEPENDS="menu-cache glib-dev glibc-dev libffi-dev libgio-dev pcre-dev zlib-dev" 99.23 + 99.24 # Rules to gen a SliTaz package suitable for Tazpkg. 99.25 genpkg_rules() 99.26 { 99.27 - mkdir -p $fs/usr/lib 99.28 - cp -a $install/usr/include $fs/usr 99.29 - cp -a $install/usr/lib/*.*a $fs/usr/lib 99.30 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 99.31 + cook_copy_files *.h *.la *.pc 99.32 }
100.1 --- a/menu-cache/receipt Sat Apr 15 16:06:43 2017 +0300 100.2 +++ b/menu-cache/receipt Fri Apr 21 14:48:05 2017 +0300 100.3 @@ -1,27 +1,27 @@ 100.4 # SliTaz package receipt. 100.5 100.6 PACKAGE="menu-cache" 100.7 -VERSION="1.0.0" 100.8 +VERSION="1.0.2" 100.9 CATEGORY="x-window" 100.10 SHORT_DESC="LXDE implementation of the freedesktop Menu's cache" 100.11 MAINTAINER="pankso@slitaz.org" 100.12 LICENSE="GPL2" 100.13 WEB_SITE="https://github.com/lxde/menu-cache" 100.14 -TARBALL="$PACKAGE-$VERSION.tar.xz" 100.15 -WGET_URL="$SF_MIRROR/lxde/$TARBALL" 100.16 TAGS="LXDE" 100.17 HOST_ARCH="i486 arm" 100.18 100.19 -DEPENDS="glib glibc-base libffi libfm libgio pcre zlib" # slitaz-menus ? 100.20 -BUILD_DEPENDS="gtk-doc libtool libfm-dev" 100.21 +TARBALL="$PACKAGE-$VERSION.tar.xz" 100.22 +WGET_URL="$SF_MIRROR/lxde/$TARBALL" 100.23 + 100.24 +DEPENDS="glib libfm-extra libgio" 100.25 +BUILD_DEPENDS="glib-dev libfm-extra-dev gtk-doc" 100.26 100.27 # Rules to configure and make the package. 100.28 compile_rules() 100.29 { 100.30 ./configure \ 100.31 - --prefix=/usr \ 100.32 - --sysconfdir=/etc \ 100.33 - --libexecdir=/usr/lib \ 100.34 + --disable-static \ 100.35 + --enable-gtk-doc \ 100.36 $CONFIGURE_ARGS && 100.37 make && make install 100.38 } 100.39 @@ -29,7 +29,6 @@ 100.40 # Rules to gen a SliTaz package suitable for Tazpkg. 100.41 genpkg_rules() 100.42 { 100.43 - mkdir -p $fs/usr/lib 100.44 - cp -a $install/usr/lib/*.so* $fs/usr/lib 100.45 - cp -a $install/usr/lib/menu-cache $fs/usr/lib 100.46 + cook_copy_files *.so* 100.47 + cook_copy_folders libexec 100.48 }
101.1 --- a/mysql-client/receipt Sat Apr 15 16:06:43 2017 +0300 101.2 +++ b/mysql-client/receipt Fri Apr 21 14:48:05 2017 +0300 101.3 @@ -6,11 +6,11 @@ 101.4 SHORT_DESC="SQL database system client files." 101.5 MAINTAINER="pascal.bellard@slitaz.org" 101.6 LICENSE="GPL2" 101.7 -WEB_SITE="http://www.mysql.com/" 101.8 -WANTED="mysql" 101.9 +WEB_SITE="https://www.mysql.com/" 101.10 PROVIDE="mysql_or_postgresql" 101.11 101.12 -DEPENDS="libmysqlclient zlib ncurses gcc-lib-base ncursesw" 101.13 +WANTED="mysql" 101.14 +DEPENDS="libmysqlclient libcrypto libssl ncurses zlib" 101.15 101.16 # Rules to gen a SliTaz package suitable for Tazpkg. 101.17 genpkg_rules()
102.1 --- a/mysql-dev/receipt Sat Apr 15 16:06:43 2017 +0300 102.2 +++ b/mysql-dev/receipt Fri Apr 21 14:48:05 2017 +0300 102.3 @@ -6,10 +6,10 @@ 102.4 SHORT_DESC="SQL database system devel files." 102.5 MAINTAINER="pascal.bellard@slitaz.org" 102.6 LICENSE="GPL2" 102.7 -WEB_SITE="http://www.mysql.com/" 102.8 +WEB_SITE="https://www.mysql.com/" 102.9 + 102.10 WANTED="mysql" 102.11 - 102.12 -DEPENDS="libmysqlclient zlib" 102.13 +DEPENDS="mysql mysql-client mysql-test libmysqlclient" 102.14 102.15 # Rules to gen a SliTaz package suitable for Tazpkg. 102.16 genpkg_rules()
103.1 --- a/mysql-test/receipt Sat Apr 15 16:06:43 2017 +0300 103.2 +++ b/mysql-test/receipt Fri Apr 21 14:48:05 2017 +0300 103.3 @@ -6,10 +6,10 @@ 103.4 SHORT_DESC="SQL database system tests and benchs." 103.5 MAINTAINER="pascal.bellard@slitaz.org" 103.6 LICENSE="GPL2" 103.7 -WEB_SITE="http://www.mysql.com/" 103.8 +WEB_SITE="https://www.mysql.com/" 103.9 + 103.10 WANTED="mysql" 103.11 - 103.12 -DEPENDS="mysql perl" 103.13 +DEPENDS="mysql perl libcrypto libssl zlib" 103.14 103.15 # Rules to gen a SliTaz package suitable for Tazpkg. 103.16 genpkg_rules()
104.1 --- a/mysql/receipt Sat Apr 15 16:06:43 2017 +0300 104.2 +++ b/mysql/receipt Fri Apr 21 14:48:05 2017 +0300 104.3 @@ -6,17 +6,19 @@ 104.4 SHORT_DESC="SQL database system." 104.5 MAINTAINER="pascal.bellard@slitaz.org" 104.6 LICENSE="GPL2" 104.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 104.8 -WEB_SITE="http://www.mysql.com/" 104.9 -WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${VERSION%.*}/$TARBALL" 104.10 +WEB_SITE="https://www.mysql.com/" 104.11 CONFIG_FILES="/etc/mysql" 104.12 DATABASE_FILES="/var/lib/mysql" 104.13 TAZPANEL_DAEMON="man|edit::/etc/mysql/my.cnf|options|web::$WEB_SITE" 104.14 CROSS="bug: can not run test programm" 104.15 104.16 -DEPENDS="busybox libmysqlclient mysql-client zlib slitaz-base-files \ 104.17 -gcc-lib-base openssl readline" 104.18 +TARBALL="$PACKAGE-$VERSION.tar.gz" 104.19 +WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${VERSION%.*}/$TARBALL" 104.20 + 104.21 +DEPENDS="libmysqlclient mysql-client slitaz-base-files \ 104.22 +libcrypto libssl ncurses zlib" 104.23 BUILD_DEPENDS="cmake openssl-dev zlib-dev ncurses-dev readline-dev" 104.24 +SPLIT="mysql-client mysql-test mysql-dev libmysqlclient" 104.25 104.26 # Rules to configure and make the package. 104.27 compile_rules() 104.28 @@ -94,22 +96,21 @@ 104.29 # Pre and post install commands for Tazpkg. 104.30 post_install() 104.31 { 104.32 - 104.33 local user 104.34 local group 104.35 - 104.36 + 104.37 user=mysql 104.38 group=mysql 104.39 - 104.40 + 104.41 if ! grep -q $user "$1/etc/passwd"; then 104.42 - echo -n "Adding user/group $user..." 104.43 + action "Adding user/group $user..." 104.44 chroot "$1/" addgroup -S $group 104.45 chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user 104.46 status 104.47 fi 104.48 # adduser mysql if needed 104.49 if ! grep -q ${user} "$1/etc/passwd"; then 104.50 - echo -n "Adding user MySQL..." 104.51 + action "Adding user MySQL..." 104.52 chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \ 104.53 -g "MySQL Daemon user" -u 27 -H -D -S -G ${group} ${user} 104.54 status 104.55 @@ -117,7 +118,7 @@ 104.56 #chroot "$1/" /bin/chown ${user}.${group} $(cat "$1/$INSTALLED/$PACKAGE/files.list") 104.57 chroot "$1/" /bin/chown -R ${user}.${group} /var/lib/mysql 104.58 chroot "$1/" mysql_install_db --user=${user} --basedir=/usr 104.59 - cat <<EOF 104.60 + [ -n "$quiet" ] || cat <<EOF 104.61 ---- 104.62 To start $PACKAGE server you can run : 104.63
105.1 --- a/nano-doc/receipt Sat Apr 15 16:06:43 2017 +0300 105.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 105.3 @@ -1,17 +0,0 @@ 105.4 -# SliTaz package receipt. 105.5 - 105.6 -PACKAGE="nano-doc" 105.7 -VERSION="2.6.1" 105.8 -CATEGORY="doc" 105.9 -SHORT_DESC="Nano Text Editor, documentation and man pages" 105.10 -MAINTAINER="al.bobylev@gmail.com" 105.11 -LICENSE="GPL3" 105.12 -WEB_SITE="https://nano-editor.org/" 105.13 - 105.14 -WANTED="nano" 105.15 - 105.16 -genpkg_rules() 105.17 -{ 105.18 - mkdir -p $fs/usr/share 105.19 - cp -a $install/usr/share/doc $install/usr/share/man $fs/usr/share 105.20 -}
106.1 --- a/nano/receipt Sat Apr 15 16:06:43 2017 +0300 106.2 +++ b/nano/receipt Fri Apr 21 14:48:05 2017 +0300 106.3 @@ -1,49 +1,53 @@ 106.4 # SliTaz package receipt. 106.5 106.6 PACKAGE="nano" 106.7 -VERSION="2.6.1" 106.8 +VERSION="2.6.3" 106.9 CATEGORY="utilities" 106.10 SHORT_DESC="Nano Text Editor" 106.11 MAINTAINER="pankso@slitaz.org" 106.12 LICENSE="GPL3" 106.13 WEB_SITE="https://nano-editor.org/" 106.14 -TARBALL="$PACKAGE-$VERSION.tar.gz" 106.15 -WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL" 106.16 TAGS="text-editor" 106.17 HOST_ARCH="i486 arm" 106.18 +SUGGESTED="gpm" 106.19 106.20 -DEPENDS="ncursesw zlib" 106.21 -SUGGESTED="gpm" 106.22 -BUILD_DEPENDS="ncursesw-dev zlib-dev groff" 106.23 -SPLIT="nano-doc" 106.24 +TARBALL="$PACKAGE-$VERSION.tar.xz" 106.25 +WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL" 106.26 + 106.27 +DEPENDS="ncurses zlib" 106.28 +BUILD_DEPENDS="gettext ncurses-dev zlib-dev groff" 106.29 +BUILD_DEPENDS_arm="ncursesw-dev zlib-dev" 106.30 106.31 # Handle cross compilation 106.32 case "$ARCH" in 106.33 - arm*) BUILD_DEPENDS="ncursesw-dev zlib-dev" ;; 106.34 + arm*) BUILD_DEPENDS=$BUILD_DEPENDS_arm ;; 106.35 esac 106.36 106.37 # Rules to configure and make the package. 106.38 compile_rules() 106.39 { 106.40 + while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series 106.41 + 106.42 ./configure \ 106.43 --sysconfdir=/etc \ 106.44 --localstatedir=/var \ 106.45 + --docdir=/usr/share/doc/nano-$VERSION \ 106.46 --disable-wrapping-as-root \ 106.47 --enable-utf8 \ 106.48 $CONFIGURE_ARGS $ARCH_ARGS && 106.49 - make && make install 106.50 + make && make install || exit 1 106.51 + 106.52 + # Config file. 106.53 + mkdir -p $install/etc 106.54 + cp $src/doc/nanorc.sample $install/etc/nanorc 106.55 + 106.56 + install -v -m644 doc/texinfo/nano.html $install/usr/share/doc/nano-$VERSION 106.57 } 106.58 106.59 # Rules to gen a SliTaz package suitable for Tazpkg. 106.60 genpkg_rules() 106.61 { 106.62 - cp -a $install/* $fs 106.63 - rm -r $fs/usr/share/doc $fs/usr/share/locale $fs/usr/share/man 106.64 - 106.65 - # Config file. 106.66 - mkdir -p $fs/etc 106.67 - cp $src/doc/nanorc.sample $fs/etc/nanorc 106.68 - cd $fs; patch -p0 < $stuff/nano.patch 106.69 + cook_copy_folders etc bin nano 106.70 106.71 # Shrink 106.72 for i in $fs/usr/share/nano/*.nanorc; do
107.1 --- a/nano/stuff/nano.patch Sat Apr 15 16:06:43 2017 +0300 107.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 107.3 @@ -1,205 +0,0 @@ 107.4 ---- ./etc/nanorc 107.5 -+++ ./etc/nanorc 107.6 -@@ -1,10 +1,6 @@ 107.7 --## Sample initialization file for nano. 107.8 -+## /etc/nanorc: system-wide initialization file for nano. 107.9 -+## ~/.nanorc: personal config file. 107.10 - ## 107.11 --## Please note that you must have configured nano with --enable-nanorc 107.12 --## for this file to be read! Also note that this file should not be in 107.13 --## DOS or Mac format, and that characters specially interpreted by the 107.14 --## shell should not be escaped here. 107.15 --## 107.16 - ## To make sure an option is disabled, use "unset <option>". 107.17 - ## 107.18 - ## For the options that take parameters, the default value is given. 107.19 -@@ -58,7 +54,7 @@ 107.20 - # set fill -8 107.21 - 107.22 - ## Remember the used search/replace strings for the next session. 107.23 --# set historylog 107.24 -+set historylog 107.25 - 107.26 - ## Make the justify command kill whitespace at the end of lines. 107.27 - # set justifytrim 107.28 -@@ -80,7 +76,7 @@ 107.29 - ## mouse clicks can be used to place the cursor, set the mark (with a 107.30 - ## double click), and execute shortcuts. The mouse will work in the X 107.31 - ## Window System, and on the console when gpm is running. 107.32 --# set mouse 107.33 -+set mouse 107.34 - 107.35 - ## Switch on multiple file buffers (inserting a file will put it into 107.36 - ## a separate buffer). 107.37 -@@ -159,7 +155,7 @@ 107.38 - # set suspend 107.39 - 107.40 - ## Use this tab size instead of the default; it must be greater than 0. 107.41 --# set tabsize 8 107.42 -+set tabsize 4 107.43 - 107.44 - ## Convert typed tabs to spaces. 107.45 - # set tabstospaces 107.46 -@@ -249,3 +245,151 @@ 107.47 - 107.48 - ## Set this if your Backspace key sends Del most of the time. 107.49 - # bind Del backspace all 107.50 -+ 107.51 -+ 107.52 -+ 107.53 -+## Assembler 107.54 -+# include "/usr/share/nano/asm.nanorc" 107.55 -+ 107.56 -+## Autoconf 107.57 -+# include "/usr/share/nano/autoconf.nanorc" 107.58 -+ 107.59 -+## AWK 107.60 -+# include "/usr/share/nano/awk.nanorc" 107.61 -+ 107.62 -+## C/C++ 107.63 -+include "/usr/share/nano/c.nanorc" 107.64 -+ 107.65 -+## Changelogs 107.66 -+# include "/usr/share/nano/changelog.nanorc" 107.67 -+ 107.68 -+## CMake 107.69 -+# include "/usr/share/nano/cmake.nanorc" 107.70 -+ 107.71 -+## CSS 107.72 -+include "/usr/share/nano/css.nanorc" 107.73 -+ 107.74 -+## Apt's sources.list 107.75 -+# include "/usr/share/nano/debian.nanorc" 107.76 -+ 107.77 -+## Default 107.78 -+include "/usr/share/nano/default.nanorc" 107.79 -+ 107.80 -+## Emacs Lisp 107.81 -+# include "/usr/share/nano/elisp.nanorc" 107.82 -+ 107.83 -+## Fortran 90/95 107.84 -+# include "/usr/share/nano/fortran.nanorc" 107.85 -+ 107.86 -+## Gentoo ebuilds/eclasses 107.87 -+# include "/usr/share/nano/gentoo.nanorc" 107.88 -+ 107.89 -+## Go 107.90 -+# include "/usr/share/nano/go.nanorc" 107.91 -+ 107.92 -+## Groff 107.93 -+# include "/usr/share/nano/groff.nanorc" 107.94 -+ 107.95 -+## Guile Scheme 107.96 -+# include "/usr/share/nano/guile.nanorc" 107.97 -+ 107.98 -+## HTML 107.99 -+# include "/usr/share/nano/html.nanorc" 107.100 -+ 107.101 -+## Java 107.102 -+# include "/usr/share/nano/java.nanorc" 107.103 -+ 107.104 -+## Javascript 107.105 -+include "/usr/share/nano/javascript.nanorc" 107.106 -+ 107.107 -+## JSON 107.108 -+# include "/usr/share/nano/json.nanorc" 107.109 -+ 107.110 -+## Lua 107.111 -+# include "/usr/share/nano/lua.nanorc" 107.112 -+ 107.113 -+## Makefiles 107.114 -+include "/usr/share/nano/makefile.nanorc" 107.115 -+ 107.116 -+## Manpages 107.117 -+include "/usr/share/nano/man.nanorc" 107.118 -+ 107.119 -+## Magicpoint presentations 107.120 -+# include "/usr/share/nano/mgp.nanorc" 107.121 -+ 107.122 -+## Quoted emails (under e.g. mutt) 107.123 -+include "/usr/share/nano/mutt.nanorc" 107.124 -+ 107.125 -+## Nanorc files 107.126 -+include "/usr/share/nano/nanorc.nanorc" 107.127 -+ 107.128 -+## nftables 107.129 -+# include "/usr/share/nano/nftables.nanorc" 107.130 -+ 107.131 -+## C/C++/Obj-C 107.132 -+# include "/usr/share/nano/objc.nanorc" 107.133 -+ 107.134 -+## OCaml 107.135 -+# include "/usr/share/nano/ocaml.nanorc" 107.136 -+ 107.137 -+## Patch files 107.138 -+include "/usr/share/nano/patch.nanorc" 107.139 -+ 107.140 -+## Perl 107.141 -+# include "/usr/share/nano/perl.nanorc" 107.142 -+ 107.143 -+## PHP 107.144 -+include "/usr/share/nano/php.nanorc" 107.145 -+ 107.146 -+## PO files 107.147 -+include "/usr/share/nano/po.nanorc" 107.148 -+ 107.149 -+## PostgreSQL 107.150 -+# include "/usr/share/nano/postgresql.nanorc" 107.151 -+ 107.152 -+## POV-Ray 107.153 -+# include "/usr/share/nano/pov.nanorc" 107.154 -+ 107.155 -+## Python 107.156 -+include "/usr/share/nano/python.nanorc" 107.157 -+ 107.158 -+## Ruby 107.159 -+# include "/usr/share/nano/ruby.nanorc" 107.160 -+ 107.161 -+## Bourne shell scripts 107.162 -+include "/usr/share/nano/sh.nanorc" 107.163 -+ 107.164 -+## RPM spec files 107.165 -+# include "/usr/share/nano/spec.nanorc" 107.166 -+ 107.167 -+## Tcl files 107.168 -+# include "/usr/share/nano/tcl.nanorc" 107.169 -+ 107.170 -+## TeX files 107.171 -+# include "/usr/share/nano/tex.nanorc" 107.172 -+ 107.173 -+## Texinfo files 107.174 -+# include "/usr/share/nano/texinfo.nanorc" 107.175 -+ 107.176 -+## XML files 107.177 -+include "/usr/share/nano/xml.nanorc" 107.178 -+ 107.179 -+ 107.180 -+## Config file - By SliTaz 107.181 -+syntax "conf" "\.?conf$" 107.182 -+## Keywords 107.183 -+icolor brightgreen "=" 107.184 -+## Comments 107.185 -+icolor cyan "^[[:space:]]*#.*$" 107.186 -+ 107.187 -+## HTML - With modification for SliTaz. 107.188 -+syntax "HTML" "\.html$" 107.189 -+color brightblue start="<" end=">" 107.190 -+color red "&[^; ]*;" 107.191 -+color brightwhite start="<!DOCTYPE" end=">" start="<title>" end="</title>" start="<!--" end="-->" 107.192 -+color brightcyan start="<meta" end=">" start="<link" end=">" 107.193 -+color brightyellow "<p>|</p>|<pre>|</pre>|<li>|</li>" 107.194 -+color yellow "<ul>|</ul>|<hr>|<hr />" 107.195 -+color brightred "href=|name=|rel=|http-equiv=|content=|title=|type|style" 107.196 -+color brightgreen "<h1>|</h1>|<h2>|</h2>|<h3>|</h3>|<h4>|</h4>|<h5>|</h5>|<h6>|</h6>" 107.197 -+ 107.198 - 107.199 ---- ./usr/share/nano/sh.nanorc 107.200 -+++ ./usr/share/nano/sh.nanorc 107.201 -@@ -1,6 +1,6 @@ 107.202 - ## Here is an example for Bourne shell scripts. 107.203 - 107.204 --syntax "sh" "\.sh$" 107.205 -+syntax "sh" "\.sh$" "receipt" 107.206 - header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)" 107.207 - magic "(POSIX|Bourne.*) shell script text" 107.208 - linter dash -n
108.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 108.2 +++ b/nano/stuff/patches/nanorc.patch Fri Apr 21 14:48:05 2017 +0300 108.3 @@ -0,0 +1,196 @@ 108.4 +Adjust /etc/nanorc for SliTaz. 108.5 + 108.6 +--- a/doc/nanorc.sample.in 108.7 ++++ b/doc/nanorc.sample.in 108.8 +@@ -1,10 +1,6 @@ 108.9 +-## Sample initialization file for nano. 108.10 ++## /etc/nanorc: system-wide initialization file for nano. 108.11 ++## ~/.nanorc: personal config file. 108.12 + ## 108.13 +-## Please note that you must have configured nano with --enable-nanorc 108.14 +-## for this file to be read! Also note that this file should not be in 108.15 +-## DOS or Mac format, and that characters specially interpreted by the 108.16 +-## shell should not be escaped here. 108.17 +-## 108.18 + ## To make sure an option is disabled, use "unset <option>". 108.19 + ## 108.20 + ## For the options that take parameters, the default value is given. 108.21 +@@ -58,7 +54,7 @@ 108.22 + # set fill -8 108.23 + 108.24 + ## Remember the used search/replace strings for the next session. 108.25 +-# set historylog 108.26 ++set historylog 108.27 + 108.28 + ## Make the justify command kill whitespace at the end of lines. 108.29 + # set justifytrim 108.30 +@@ -80,7 +76,7 @@ 108.31 + ## mouse clicks can be used to place the cursor, set the mark (with a 108.32 + ## double click), and execute shortcuts. The mouse will work in the X 108.33 + ## Window System, and on the console when gpm is running. 108.34 +-# set mouse 108.35 ++set mouse 108.36 + 108.37 + ## Switch on multiple file buffers (inserting a file will put it into 108.38 + ## a separate buffer). 108.39 +@@ -159,7 +155,7 @@ 108.40 + # set suspend 108.41 + 108.42 + ## Use this tab size instead of the default; it must be greater than 0. 108.43 +-# set tabsize 8 108.44 ++set tabsize 4 108.45 + 108.46 + ## Convert typed tabs to spaces. 108.47 + # set tabstospaces 108.48 +@@ -254,3 +250,151 @@ 108.49 + 108.50 + ## Set this if your Backspace key sends Del most of the time. 108.51 + # bind Del backspace all 108.52 ++ 108.53 ++ 108.54 ++ 108.55 ++## Assembler 108.56 ++# include "/usr/share/nano/asm.nanorc" 108.57 ++ 108.58 ++## Autoconf 108.59 ++# include "/usr/share/nano/autoconf.nanorc" 108.60 ++ 108.61 ++## AWK 108.62 ++# include "/usr/share/nano/awk.nanorc" 108.63 ++ 108.64 ++## C/C++ 108.65 ++include "/usr/share/nano/c.nanorc" 108.66 ++ 108.67 ++## Changelogs 108.68 ++# include "/usr/share/nano/changelog.nanorc" 108.69 ++ 108.70 ++## CMake 108.71 ++# include "/usr/share/nano/cmake.nanorc" 108.72 ++ 108.73 ++## CSS 108.74 ++include "/usr/share/nano/css.nanorc" 108.75 ++ 108.76 ++## Apt's sources.list 108.77 ++# include "/usr/share/nano/debian.nanorc" 108.78 ++ 108.79 ++## Default 108.80 ++include "/usr/share/nano/default.nanorc" 108.81 ++ 108.82 ++## Emacs Lisp 108.83 ++# include "/usr/share/nano/elisp.nanorc" 108.84 ++ 108.85 ++## Fortran 90/95 108.86 ++# include "/usr/share/nano/fortran.nanorc" 108.87 ++ 108.88 ++## Gentoo ebuilds/eclasses 108.89 ++# include "/usr/share/nano/gentoo.nanorc" 108.90 ++ 108.91 ++## Go 108.92 ++# include "/usr/share/nano/go.nanorc" 108.93 ++ 108.94 ++## Groff 108.95 ++# include "/usr/share/nano/groff.nanorc" 108.96 ++ 108.97 ++## Guile Scheme 108.98 ++# include "/usr/share/nano/guile.nanorc" 108.99 ++ 108.100 ++## HTML 108.101 ++# include "/usr/share/nano/html.nanorc" 108.102 ++ 108.103 ++## Java 108.104 ++# include "/usr/share/nano/java.nanorc" 108.105 ++ 108.106 ++## Javascript 108.107 ++include "/usr/share/nano/javascript.nanorc" 108.108 ++ 108.109 ++## JSON 108.110 ++# include "/usr/share/nano/json.nanorc" 108.111 ++ 108.112 ++## Lua 108.113 ++# include "/usr/share/nano/lua.nanorc" 108.114 ++ 108.115 ++## Makefiles 108.116 ++include "/usr/share/nano/makefile.nanorc" 108.117 ++ 108.118 ++## Manpages 108.119 ++include "/usr/share/nano/man.nanorc" 108.120 ++ 108.121 ++## Magicpoint presentations 108.122 ++# include "/usr/share/nano/mgp.nanorc" 108.123 ++ 108.124 ++## Quoted emails (under e.g. mutt) 108.125 ++include "/usr/share/nano/mutt.nanorc" 108.126 ++ 108.127 ++## Nanorc files 108.128 ++include "/usr/share/nano/nanorc.nanorc" 108.129 ++ 108.130 ++## nftables 108.131 ++# include "/usr/share/nano/nftables.nanorc" 108.132 ++ 108.133 ++## C/C++/Obj-C 108.134 ++# include "/usr/share/nano/objc.nanorc" 108.135 ++ 108.136 ++## OCaml 108.137 ++# include "/usr/share/nano/ocaml.nanorc" 108.138 ++ 108.139 ++## Patch files 108.140 ++include "/usr/share/nano/patch.nanorc" 108.141 ++ 108.142 ++## Perl 108.143 ++# include "/usr/share/nano/perl.nanorc" 108.144 ++ 108.145 ++## PHP 108.146 ++include "/usr/share/nano/php.nanorc" 108.147 ++ 108.148 ++## PO files 108.149 ++include "/usr/share/nano/po.nanorc" 108.150 ++ 108.151 ++## PostgreSQL 108.152 ++# include "/usr/share/nano/postgresql.nanorc" 108.153 ++ 108.154 ++## POV-Ray 108.155 ++# include "/usr/share/nano/pov.nanorc" 108.156 ++ 108.157 ++## Python 108.158 ++include "/usr/share/nano/python.nanorc" 108.159 ++ 108.160 ++## Ruby 108.161 ++# include "/usr/share/nano/ruby.nanorc" 108.162 ++ 108.163 ++## Bourne shell scripts 108.164 ++include "/usr/share/nano/sh.nanorc" 108.165 ++ 108.166 ++## RPM spec files 108.167 ++# include "/usr/share/nano/spec.nanorc" 108.168 ++ 108.169 ++## Tcl files 108.170 ++# include "/usr/share/nano/tcl.nanorc" 108.171 ++ 108.172 ++## TeX files 108.173 ++# include "/usr/share/nano/tex.nanorc" 108.174 ++ 108.175 ++## Texinfo files 108.176 ++# include "/usr/share/nano/texinfo.nanorc" 108.177 ++ 108.178 ++## XML files 108.179 ++include "/usr/share/nano/xml.nanorc" 108.180 ++ 108.181 ++ 108.182 ++## Config file - By SliTaz 108.183 ++syntax "conf" "\.?conf$" 108.184 ++## Keywords 108.185 ++icolor brightgreen "=" 108.186 ++## Comments 108.187 ++icolor cyan "^[[:space:]]*#.*$" 108.188 ++ 108.189 ++## HTML - With modification for SliTaz. 108.190 ++syntax "HTML" "\.html$" 108.191 ++color brightblue start="<" end=">" 108.192 ++color red "&[^; ]*;" 108.193 ++color brightwhite start="<!DOCTYPE" end=">" start="<title>" end="</title>" start="<!--" end="-->" 108.194 ++color brightcyan start="<meta" end=">" start="<link" end=">" 108.195 ++color brightyellow "<p>|</p>|<pre>|</pre>|<li>|</li>" 108.196 ++color yellow "<ul>|</ul>|<hr>|<hr />" 108.197 ++color brightred "href=|name=|rel=|http-equiv=|content=|title=|type|style" 108.198 ++color brightgreen "<h1>|</h1>|<h2>|</h2>|<h3>|</h3>|<h4>|</h4>|<h5>|</h5>|<h6>|</h6>" 108.199 ++
109.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 109.2 +++ b/nano/stuff/patches/receipt-as-sh.patch Fri Apr 21 14:48:05 2017 +0300 109.3 @@ -0,0 +1,12 @@ 109.4 +SliTaz receipts are shell scripts. 109.5 + 109.6 +--- a/doc/syntax/sh.nanorc 109.7 ++++ b/doc/syntax/sh.nanorc 109.8 +@@ -1,6 +1,6 @@ 109.9 + ## Here is an example for Bourne shell scripts. 109.10 + 109.11 +-syntax "sh" "\.sh$" 109.12 ++syntax "sh" "\.sh$" "receipt" 109.13 + header "^#!.*((ba|da|k|pdk)?sh[-0-9_]*|openrc-run|runscript)" 109.14 + magic "(POSIX|Bourne.*) shell script text" 109.15 + linter dash -n
110.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 110.2 +++ b/nano/stuff/patches/series Fri Apr 21 14:48:05 2017 +0300 110.3 @@ -0,0 +1,2 @@ 110.4 +nanorc.patch 110.5 +receipt-as-sh.patch
111.1 --- a/newt-dev/receipt Sat Apr 15 16:06:43 2017 +0300 111.2 +++ b/newt-dev/receipt Fri Apr 21 14:48:05 2017 +0300 111.3 @@ -1,20 +1,18 @@ 111.4 # SliTaz package receipt. 111.5 111.6 PACKAGE="newt-dev" 111.7 -VERSION="0.52.12" 111.8 +VERSION="0.52.19" 111.9 CATEGORY="development" 111.10 -SHORT_DESC="Not Erik's Windowing Toolkit dev files" 111.11 +SHORT_DESC="Programming library for color text mode (development files)" 111.12 MAINTAINER="erjo@slitaz.org" 111.13 LICENSE="GPL2" 111.14 -WANTED="newt" 111.15 WEB_SITE="https://fedorahosted.org/newt/" 111.16 111.17 +WANTED="newt" 111.18 DEPENDS="newt" 111.19 111.20 # Rules to gen a SliTaz package suitable for Tazpkg. 111.21 genpkg_rules() 111.22 { 111.23 - mkdir -p $fs/usr/lib 111.24 - cp -a $install/usr/include $fs/usr 111.25 - cp -a $install/usr/lib/*.*a $fs/usr/lib 111.26 + cook_copy_files *.h *.pc 111.27 }
112.1 --- a/newt/receipt Sat Apr 15 16:06:43 2017 +0300 112.2 +++ b/newt/receipt Fri Apr 21 14:48:05 2017 +0300 112.3 @@ -1,42 +1,36 @@ 112.4 # SliTaz package receipt. 112.5 112.6 PACKAGE="newt" 112.7 -VERSION="0.52.12" 112.8 -CATEGORY="development" 112.9 -SHORT_DESC="Not Erik's Windowing Toolkit" 112.10 +VERSION="0.52.19" 112.11 +CATEGORY="libdevel" 112.12 +SHORT_DESC="Programming library for color text mode" 112.13 MAINTAINER="erjo@slitaz.org" 112.14 LICENSE="GPL2" 112.15 +WEB_SITE="https://fedorahosted.org/newt/" 112.16 + 112.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 112.18 -WEB_SITE="https://fedorahosted.org/newt/" 112.19 WGET_URL="https://fedorahosted.org/releases/n/e/$PACKAGE/$TARBALL" 112.20 112.21 -DEPENDS="slang popt tcl" 112.22 -BUILD_DEPENDS="slang-dev tcl popt-dev python-dev wget" 112.23 +DEPENDS="popt python slang tcl gpm" 112.24 +BUILD_DEPENDS="slang-dev popt-dev python-dev tcl-dev" 112.25 112.26 # Rules to configure and make the package. 112.27 compile_rules() 112.28 { 112.29 - cd $src 112.30 + sed -e 's/^LIBNEWT =/#&/' \ 112.31 + -e '/install -m 644 $(LIBNEWT)/ s/^/#/' \ 112.32 + -e 's/$(LIBNEWT)/$(LIBNEWTSONAME)/g' \ 112.33 + -i Makefile.in && 112.34 112.35 - python=$(ls -d /usr/lib/python*/ | sed 's|/usr/lib/\(.*\)/|\1|' | head -1) 112.36 - tcl=$(ls /usr/lib/libtcl*.so | sed 's|/usr/lib/lib\(.*\).so|\1|') 112.37 - 112.38 - echo "Patching for $python and $tcl..." 112.39 - sed -i -e "s/python2.4/$python/" \ 112.40 - -e "s/tcl8.4/$tcl/" \ 112.41 - Makefile.in 112.42 - ./configure --prefix=/usr --infodir=/usr/share/info \ 112.43 - --mandir=/usr/share/man $CONFIGURE_ARGS && 112.44 - make && 112.45 - make instroot=$DESTDIR install 112.46 + ./configure \ 112.47 + --with-gpm-support \ 112.48 + $CONFIGURE_ARGS && 112.49 + make && make install 112.50 } 112.51 112.52 # Rules to gen a SliTaz package suitable for Tazpkg. 112.53 genpkg_rules() 112.54 { 112.55 - mkdir -p $fs/usr/lib 112.56 - cp -a $install/usr/bin $fs/usr 112.57 - cp -a $install/usr/lib/*.so* $fs/usr/lib 112.58 - cp -a $install/usr/lib/python* $fs/usr/lib 112.59 + cook_copy_folders bin 112.60 + cook_copy_files *.so* *.py *.mo 112.61 } 112.62 -
113.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 113.2 +++ b/oniguruma-dev/receipt Fri Apr 21 14:48:05 2017 +0300 113.3 @@ -0,0 +1,18 @@ 113.4 +# SliTaz package receipt. 113.5 + 113.6 +PACKAGE="oniguruma-dev" 113.7 +VERSION="6.2.0" 113.8 +CATEGORY="development" 113.9 +SHORT_DESC="Regular expression library (development files)" 113.10 +MAINTAINER="al.bobylev@gmail.com" 113.11 +LICENSE="BSD" 113.12 +WEB_SITE="https://github.com/kkos/oniguruma" 113.13 + 113.14 +WANTED="oniguruma" 113.15 +DEPENDS="oniguruma" 113.16 + 113.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 113.18 +genpkg_rules() 113.19 +{ 113.20 + cook_copy_files *.h *.a *.la *.pc onig-config 113.21 +}
114.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 114.2 +++ b/oniguruma/description.txt Fri Apr 21 14:48:05 2017 +0300 114.3 @@ -0,0 +1,11 @@ 114.4 +Oniguruma is a regular expressions library. The characteristics of this library 114.5 +is that different character encoding for every regular expression object can be 114.6 +specified. 114.7 + 114.8 +Supported character encodings: 114.9 + 114.10 +ASCII, UTF-8, UTF-16BE, UTF-16LE, UTF-32BE, UTF-32LE, EUC-JP, EUC-TW, EUC-KR, 114.11 +EUC-CN, Shift_JIS, Big5, GB18030, KOI8-R, CP1251, ISO-8859-1, ISO-8859-2, 114.12 +ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6, ISO-8859-7, ISO-8859-8, 114.13 +ISO-8859-9, ISO-8859-10, ISO-8859-11, ISO-8859-13, ISO-8859-14, ISO-8859-15, 114.14 +ISO-8859-16
115.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 115.2 +++ b/oniguruma/receipt Fri Apr 21 14:48:05 2017 +0300 115.3 @@ -0,0 +1,30 @@ 115.4 +# SliTaz package receipt. 115.5 + 115.6 +PACKAGE="oniguruma" 115.7 +VERSION="6.2.0" 115.8 +CATEGORY="libdevel" 115.9 +SHORT_DESC="Regular expression library" 115.10 +MAINTAINER="al.bobylev@gmail.com" 115.11 +LICENSE="BSD" 115.12 +WEB_SITE="https://github.com/kkos/oniguruma" 115.13 + 115.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 115.15 +WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz" 115.16 + 115.17 +BUILD_DEPENDS="automake libtool" 115.18 + 115.19 +# Rules to configure and make the package. 115.20 +compile_rules() 115.21 +{ 115.22 + autoreconf -vfi && 115.23 + ./configure $CONFIGURE_ARGS && make && make install && 115.24 + 115.25 + docdir=$install/usr/share/doc/oniguruma-$VERSION && 115.26 + mkdir -p $docdir && cp doc/* $docdir && rm $docdir/*.ja 115.27 +} 115.28 + 115.29 +# Rules to gen a SliTaz package suitable for Tazpkg. 115.30 +genpkg_rules() 115.31 +{ 115.32 + cook_copy_files *.so* 115.33 +}
116.1 --- a/p11-kit-dev/receipt Sat Apr 15 16:06:43 2017 +0300 116.2 +++ b/p11-kit-dev/receipt Fri Apr 21 14:48:05 2017 +0300 116.3 @@ -1,20 +1,18 @@ 116.4 # SliTaz package receipt. 116.5 116.6 PACKAGE="p11-kit-dev" 116.7 -VERSION="0.6" 116.8 +VERSION="0.23.2" 116.9 CATEGORY="development" 116.10 -SHORT_DESC="Library to work with PKCS#11 modules, development files" 116.11 +SHORT_DESC="Library to work with PKCS#11 modules (development files)" 116.12 MAINTAINER="slaxemulator@gmail.com" 116.13 LICENSE="BSD" 116.14 -WEB_SITE="http://p11-glue.freedesktop.org" 116.15 +WEB_SITE="https://p11-glue.freedesktop.org/" 116.16 + 116.17 WANTED="p11-kit" 116.18 - 116.19 -DEPENDS="p11-kit pkg-config" 116.20 +DEPENDS="p11-kit glibc-dev libffi-dev libtasn1-dev" 116.21 116.22 # Rules to gen a SliTaz package suitable for Tazpkg. 116.23 genpkg_rules() 116.24 { 116.25 - mkdir -p $fs/usr/lib 116.26 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 116.27 - cp -a $install/usr/include $fs/usr 116.28 + cook_copy_files *.h *.la *.pc 116.29 }
117.1 --- a/p11-kit/receipt Sat Apr 15 16:06:43 2017 +0300 117.2 +++ b/p11-kit/receipt Fri Apr 21 14:48:05 2017 +0300 117.3 @@ -1,31 +1,31 @@ 117.4 # SliTaz package receipt. 117.5 117.6 PACKAGE="p11-kit" 117.7 -VERSION="0.6" 117.8 +VERSION="0.23.2" 117.9 CATEGORY="security" 117.10 LICENSE="BSD" 117.11 SHORT_DESC="Library to work with PKCS#11 modules" 117.12 MAINTAINER="slaxemulator@gmail.com" 117.13 -WEB_SITE="http://p11-glue.freedesktop.org" 117.14 +WEB_SITE="https://p11-glue.freedesktop.org/" 117.15 + 117.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 117.17 -WGET_URL="$WEB_SITE/releases/$TARBALL" 117.18 +WGET_URL="http://p11-glue.freedesktop.org/releases/$TARBALL" 117.19 + 117.20 +DEPENDS="libffi libtasn1" 117.21 +BUILD_DEPENDS="gettext libtasn1-dev gtk-doc libxslt cacerts" 117.22 117.23 # Rules to configure and make the package. 117.24 compile_rules() 117.25 { 117.26 - cd $src 117.27 ./configure \ 117.28 --sysconfdir=/etc \ 117.29 - --with-module-path=/usr/lib/pkcs11 \ 117.30 - $CONFIGURE_ARGS && 117.31 + $CONFIGURE_ARGS && 117.32 make && make install 117.33 } 117.34 117.35 # Rules to gen a SliTaz package suitable for Tazpkg. 117.36 genpkg_rules() 117.37 { 117.38 - mkdir -p $fs/usr/lib 117.39 - cp -a $install/etc $fs 117.40 - cp -a $install/usr/bin $fs/usr 117.41 - cp -a $install/usr/lib/*.so* $fs/usr/lib 117.42 + cook_copy_folders etc bin p11-kit 117.43 + cook_copy_files *.so* 117.44 }
118.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 118.2 +++ b/pcre-apps/receipt Fri Apr 21 14:48:05 2017 +0300 118.3 @@ -0,0 +1,19 @@ 118.4 +# SliTaz package receipt. 118.5 + 118.6 +PACKAGE="pcre-apps" 118.7 +VERSION="8.39" 118.8 +CATEGORY="development" 118.9 +SHORT_DESC="Perl Compatible Regular Expressions (applications)" 118.10 +MAINTAINER="al.bobylev@gmail.com" 118.11 +LICENSE="BSD" 118.12 +WEB_SITE="http://www.pcre.org/" 118.13 +HOST_ARCH="i486 arm" 118.14 + 118.15 +WANTED="pcre" 118.16 +DEPENDS="bzlib ncurses pcre readline zlib" 118.17 + 118.18 +# Rules to gen a SliTaz package suitable for Tazpkg. 118.19 +genpkg_rules() 118.20 +{ 118.21 + cook_copy_files pcregrep pcretest 118.22 +}
119.1 --- a/pcre-dev/receipt Sat Apr 15 16:06:43 2017 +0300 119.2 +++ b/pcre-dev/receipt Fri Apr 21 14:48:05 2017 +0300 119.3 @@ -3,18 +3,17 @@ 119.4 PACKAGE="pcre-dev" 119.5 VERSION="8.39" 119.6 CATEGORY="development" 119.7 -SHORT_DESC="Perl Compatible Regular Expressions, development files" 119.8 +SHORT_DESC="Perl Compatible Regular Expressions (development files)" 119.9 MAINTAINER="pankso@slitaz.org" 119.10 LICENSE="BSD" 119.11 WEB_SITE="http://www.pcre.org/" 119.12 HOST_ARCH="i486 arm" 119.13 119.14 WANTED="pcre" 119.15 -DEPENDS="pcre glib pkg-config" 119.16 +DEPENDS="pcre pcre-apps" 119.17 119.18 # Rules to gen a SliTaz package suitable for Tazpkg. 119.19 genpkg_rules() 119.20 { 119.21 - cook_copy_folders bin include lib 119.22 - cook_split_rm pcre 119.23 + cook_copy_files pcre-config *.h *.la *.pc 119.24 }
120.1 --- a/pcre/receipt Sat Apr 15 16:06:43 2017 +0300 120.2 +++ b/pcre/receipt Fri Apr 21 14:48:05 2017 +0300 120.3 @@ -12,17 +12,28 @@ 120.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 120.5 WGET_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$TARBALL" 120.6 120.7 +BUILD_DEPENDS="zlib-dev bzip2-dev readline-dev" 120.8 + 120.9 # Rules to configure and make the package. 120.10 compile_rules() 120.11 { 120.12 ./configure \ 120.13 - --prefix=/usr \ 120.14 + --docdir=/usr/share/doc/pcre-$VERSION \ 120.15 + --enable-unicode-properties \ 120.16 --enable-pcre16 \ 120.17 --enable-pcre32 \ 120.18 + --enable-pcregrep-libz \ 120.19 + --enable-pcregrep-libbz2 \ 120.20 + --enable-pcretest-libreadline \ 120.21 + --disable-static \ 120.22 --enable-jit \ 120.23 - --enable-unicode-properties \ 120.24 $CONFIGURE_ARGS && 120.25 - make && make install 120.26 + make && make install && 120.27 + 120.28 + mkdir -p $install/lib && 120.29 + mv -v $install/usr/lib/libpcre.so.* $install/lib && 120.30 + ln -sfv ../../lib/$(readlink $install/usr/lib/libpcre.so) \ 120.31 + $install/usr/lib/libpcre.so 120.32 } 120.33 120.34 # Rules to gen a SliTaz package suitable for Tazpkg.
121.1 --- a/popt-dev/receipt Sat Apr 15 16:06:43 2017 +0300 121.2 +++ b/popt-dev/receipt Fri Apr 21 14:48:05 2017 +0300 121.3 @@ -3,20 +3,17 @@ 121.4 PACKAGE="popt-dev" 121.5 VERSION="1.16" 121.6 CATEGORY="development" 121.7 -SHORT_DESC="Library for parsing command line options devel files." 121.8 +SHORT_DESC="Library for parsing command line options (development files)" 121.9 MAINTAINER="pankso@slitaz.org" 121.10 LICENSE="MIT" 121.11 -WANTED="popt" 121.12 -WEB_SITE="http://directory.fsf.org/project/popt/" 121.13 +WEB_SITE="http://directory.fsf.org/wiki/Popt" 121.14 HOST_ARCH="i486 arm" 121.15 121.16 -DEPENDS="pkg-config" 121.17 +WANTED="popt" 121.18 +DEPENDS="popt" 121.19 121.20 # Rules to gen a SliTaz package suitable for Tazpkg. 121.21 genpkg_rules() 121.22 { 121.23 - mkdir -p $fs/usr/lib 121.24 - cp -a $install/usr/lib/*.*a $fs/usr/lib 121.25 - cp -a $install/usr/include $fs/usr 121.26 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 121.27 + cook_copy_files *.h *.la *.pc 121.28 }
122.1 --- a/popt/receipt Sat Apr 15 16:06:43 2017 +0300 122.2 +++ b/popt/receipt Fri Apr 21 14:48:05 2017 +0300 122.3 @@ -3,26 +3,28 @@ 122.4 PACKAGE="popt" 122.5 VERSION="1.16" 122.6 CATEGORY="system-tools" 122.7 -SHORT_DESC="Library for parsing command line options." 122.8 +SHORT_DESC="Library for parsing command line options" 122.9 MAINTAINER="pankso@slitaz.org" 122.10 LICENSE="MIT" 122.11 +WEB_SITE="http://directory.fsf.org/wiki/Popt" 122.12 +HOST_ARCH="i486 arm" 122.13 + 122.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 122.15 -WEB_SITE="http://directory.fsf.org/project/popt/" 122.16 WGET_URL="http://rpm5.org/files/popt/$TARBALL" 122.17 -HOST_ARCH="i486 arm" 122.18 122.19 BUILD_DEPENDS="gettext" 122.20 122.21 # Rules to configure and make the package. 122.22 compile_rules() 122.23 { 122.24 - ./configure $CONFIGURE_ARGS && 122.25 + ./configure \ 122.26 + --disable-static \ 122.27 + $CONFIGURE_ARGS && 122.28 make && make install 122.29 } 122.30 122.31 # Rules to gen a SliTaz package suitable for Tazpkg. 122.32 genpkg_rules() 122.33 { 122.34 - mkdir -p $fs/usr/lib 122.35 - cp -a $install/usr/lib/*.so* $fs/usr/lib 122.36 + cook_copy_files *.so* 122.37 }
123.1 --- a/postgresql-client/receipt Sat Apr 15 16:06:43 2017 +0300 123.2 +++ b/postgresql-client/receipt Fri Apr 21 14:48:05 2017 +0300 123.3 @@ -1,24 +1,20 @@ 123.4 # SliTaz package receipt. 123.5 123.6 PACKAGE="postgresql-client" 123.7 -VERSION="9.2.3" 123.8 +VERSION="9.5.4" 123.9 CATEGORY="misc" 123.10 -SHORT_DESC="SQL database system client files." 123.11 +SHORT_DESC="Advanced object-relational database management system (client files)" 123.12 MAINTAINER="pascal.bellard@slitaz.org" 123.13 LICENSE="BSD" 123.14 -WEB_SITE="http://www.postgresql.org/" 123.15 -WANTED="postgresql" 123.16 +WEB_SITE="https://www.postgresql.org/" 123.17 PROVIDE="mysql_or_postgresql" 123.18 123.19 +WANTED="postgresql" 123.20 DEPENDS="libpostgresqlclient zlib ncurses readline" 123.21 123.22 # Rules to gen a SliTaz package suitable for Tazpkg. 123.23 genpkg_rules() 123.24 { 123.25 - while read file; do 123.26 - dir=$(dirname $file) 123.27 - [ -d $fs$dir ] || mkdir -p $fs$dir 123.28 - cp -a $install$file $fs$file 123.29 - done < $wanted_stuff/$PACKAGE.files-list 123.30 + cook_copy_files clusterdb createdb createlang createuser dropdb droplang \ 123.31 + dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb 123.32 } 123.33 -
124.1 --- a/postgresql-dev/receipt Sat Apr 15 16:06:43 2017 +0300 124.2 +++ b/postgresql-dev/receipt Fri Apr 21 14:48:05 2017 +0300 124.3 @@ -1,22 +1,19 @@ 124.4 # SliTaz package receipt. 124.5 124.6 PACKAGE="postgresql-dev" 124.7 -VERSION="9.2.3" 124.8 +VERSION="9.5.4" 124.9 CATEGORY="development" 124.10 -SHORT_DESC="SQL database system development files" 124.11 +SHORT_DESC="Advanced object-relational database management system (development files)" 124.12 MAINTAINER="pascal.bellard@slitaz.org" 124.13 LICENSE="BSD" 124.14 -WEB_SITE="http://www.postgresql.org/" 124.15 +WEB_SITE="https://www.postgresql.org/" 124.16 + 124.17 WANTED="postgresql" 124.18 - 124.19 DEPENDS="postgresql" 124.20 124.21 # Rules to gen a SliTaz package suitable for Tazpkg. 124.22 genpkg_rules() 124.23 { 124.24 - mkdir -p $fs/usr/lib/postgresql $fs/usr/bin 124.25 - cp -a $install/usr/include $fs/usr 124.26 - cp -a $install/usr/bin/pg_config $fs/usr/bin 124.27 - cp -a $install/usr/lib/postgresql/*a $fs/usr/lib/postgresql 124.28 + cook_copy_files *.h *.a *.pc 124.29 + cook_copy_folders pgxs 124.30 } 124.31 -
125.1 --- a/postgresql-doc/receipt Sat Apr 15 16:06:43 2017 +0300 125.2 +++ b/postgresql-doc/receipt Fri Apr 21 14:48:05 2017 +0300 125.3 @@ -1,18 +1,17 @@ 125.4 # SliTaz package receipt. 125.5 125.6 PACKAGE="postgresql-doc" 125.7 -VERSION="9.2.3" 125.8 -CATEGORY="development" 125.9 -SHORT_DESC="SQL database system documentation" 125.10 +VERSION="9.5.4" 125.11 +CATEGORY="doc" 125.12 +SHORT_DESC="Advanced object-relational database management system (documentation)" 125.13 MAINTAINER="pascal.bellard@slitaz.org" 125.14 LICENSE="BSD" 125.15 -WEB_SITE="http://www.postgresql.org/" 125.16 +WEB_SITE="https://www.postgresql.org/" 125.17 + 125.18 WANTED="postgresql" 125.19 125.20 # Rules to gen a SliTaz package suitable for Tazpkg. 125.21 genpkg_rules() 125.22 { 125.23 - mkdir -p $fs/usr/share 125.24 - cp -a $install/usr/share/doc $fs/usr/share 125.25 + cook_copy_folders doc 125.26 } 125.27 -
126.1 --- a/postgresql/receipt Sat Apr 15 16:06:43 2017 +0300 126.2 +++ b/postgresql/receipt Fri Apr 21 14:48:05 2017 +0300 126.3 @@ -1,80 +1,79 @@ 126.4 # SliTaz package receipt. 126.5 126.6 PACKAGE="postgresql" 126.7 -VERSION="9.2.3" 126.8 +VERSION="9.5.4" 126.9 CATEGORY="misc" 126.10 -SHORT_DESC="SQL database system." 126.11 +SHORT_DESC="Advanced object-relational database management system" 126.12 MAINTAINER="pascal.bellard@slitaz.org" 126.13 LICENSE="BSD" 126.14 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 126.15 -WEB_SITE="http://www.postgresql.org/" 126.16 -WGET_URL="ftp://ftp.postgresql.org/pub/source/v$VERSION/$TARBALL" 126.17 -CONFIG_FILES="/var/lib/pgsql/*.conf" 126.18 +WEB_SITE="https://www.postgresql.org/" 126.19 DATABASE_FILES="/var/lib/pgsql" 126.20 126.21 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 126.22 +WGET_URL="http://ftp.postgresql.org/pub/source/v$VERSION/$TARBALL" 126.23 + 126.24 DEPENDS="postgresql-client slitaz-base-files" 126.25 -BUILD_DEPENDS="zlib-dev readline-dev ncurses-dev bison flex perl libxslt \ 126.26 -python-dev" 126.27 +BUILD_DEPENDS="readline-dev zlib-dev perl python-dev" 126.28 +SPLIT="libpostgresqlclient postgresql-client postgresql-doc" 126.29 126.30 # Rules to configure and make the package. 126.31 compile_rules() 126.32 { 126.33 - cd $src 126.34 - [ -d ../postgrpsql-$VERSION ] && cp -a ../postgrpsql-$VERSION/* . 126.35 - cp $stuff/*.files-list . 126.36 - ./configure --prefix=/usr --infodir=/usr/share/info \ 126.37 - --sysconfdir=/etc --includedir=/usr/include/postgresql --with-gnu-ld \ 126.38 - --with-includes=/usr/include/readline --enable-integer-datetimes \ 126.39 - --with-perl --with-python \ 126.40 - --enable-thread-safety --with-system-tzdata=/usr/share/zoneinfo \ 126.41 - --libdir=/usr/lib/postgresql --mandir=/usr/share/man \ 126.42 - $CONFIGURE_ARGS && 126.43 - make && 126.44 - make DESTDIR=$DESTDIR install 126.45 + sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h && 126.46 + 126.47 + ./configure \ 126.48 + --enable-thread-safety \ 126.49 + --docdir=/usr/share/doc/postgresql-$VERSION \ 126.50 + --with-system-tzdata=/usr/share/zoneinfo \ 126.51 + --with-perl --with-python \ 126.52 + $CONFIGURE_ARGS && 126.53 + make && make install && make install-docs 126.54 + 126.55 make -C doc/src/sgml DESTDIR=$DESTDIR install-html 126.56 } 126.57 126.58 # Rules to gen a SliTaz package suitable for Tazpkg. 126.59 genpkg_rules() 126.60 { 126.61 - mkdir -p $fs/usr/share $fs/usr/lib $fs/var/lib/pgsql \ 126.62 - $fs/var/log/postgresql $fs/etc/pgsql.d 126.63 - cp -a $install/usr/bin $fs/usr 126.64 - cp -a $install/usr/lib/postgresql $fs/usr/lib 126.65 - rm -f $fs/usr/lib/postgresql/*a 126.66 - cp -a $install/usr/share/postgresql $fs/usr/share 126.67 + cook_copy_folders bin postgresql 126.68 + cook_copy_files *.so* 126.69 + 126.70 + mkdir -p $fs/var/lib/pgsql $fs/var/log/postgresql $fs/etc/pgsql.d 126.71 cp -a $stuff/etc $fs 126.72 ln -s /var/lib/pgsql/postgresql.conf $fs/etc 126.73 chmod 700 $fs/var/lib/pgsql 126.74 - cat $stuff/*.files-list | while read file; do 126.75 - [ -f $fs$file ] && rm -f $fs$file 126.76 + 126.77 + # split 126.78 + for i in clusterdb createdb createlang createuser dropdb droplang dropuser \ 126.79 + pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb libpq.so*; do 126.80 + find $fs -name $i -delete 126.81 done 126.82 - 126.83 + rm -r $fs/usr/include $fs/usr/lib/postgresql/pgxs 126.84 } 126.85 126.86 # Pre and post install commands for Tazpkg. 126.87 post_install() 126.88 { 126.89 - # adduser postgres if needed 126.90 + # adduser postgres if needed 126.91 if ! grep -q postgres: "$1/etc/passwd"; then 126.92 - echo -n "Adding user postgres..." 126.93 + action 'Adding user postgres...' 126.94 chroot "$1/" adduser postgres -D -H -u 88 -h /var/lib/pgsql 126.95 #[ -d "$1/var/lib/pgsql" ] && rm -f "$1/var/lib/pgsql"/.* "$1/var/lib/pgsql"/* 126.96 status 126.97 fi 126.98 # addgroup postgres if needed 126.99 if ! grep -q postgres: "$1/etc/group"; then 126.100 - echo -n "Adding group postgres..." 126.101 + action 'Adding group postgres...' 126.102 chroot "$1/" sh -c 'addgroup -g 88 postgres' 126.103 status 126.104 fi 126.105 [ ! -d "$1/var/lib/pgsql" ] && mkdir -p "$1/var/lib/pgsql" 126.106 chroot "$1/" chown -R postgres.postgres /var/lib/pgsql /var/log/postgresql 126.107 - cat <<EOF 126.108 + [ -n "$quiet" ] || cat <<EOF 126.109 ---- 126.110 postgres has superuser access. 126.111 Configure /var/lib/pgsql/*.conf files. 126.112 -To start $PACKAGE server you can run : 126.113 +To start $PACKAGE server you can run: 126.114 126.115 /etc/init.d/$PACKAGE start 126.116
127.1 --- a/postgresql/stuff/postgresql-client.files-list Sat Apr 15 16:06:43 2017 +0300 127.2 +++ b/postgresql/stuff/postgresql-client.files-list Fri Apr 21 14:48:05 2017 +0300 127.3 @@ -1,13 +1,13 @@ 127.4 +/usr/bin/clusterdb 127.5 +/usr/bin/createdb 127.6 +/usr/bin/createlang 127.7 +/usr/bin/createuser 127.8 +/usr/bin/dropdb 127.9 +/usr/bin/droplang 127.10 +/usr/bin/dropuser 127.11 /usr/bin/pg_dump 127.12 +/usr/bin/pg_dumpall 127.13 /usr/bin/pg_restore 127.14 -/usr/bin/pg_dumpall 127.15 /usr/bin/psql 127.16 -/usr/bin/createdb 127.17 -/usr/bin/dropdb 127.18 -/usr/bin/createlang 127.19 -/usr/bin/droplang 127.20 -/usr/bin/createuser 127.21 -/usr/bin/dropuser 127.22 -/usr/bin/clusterdb 127.23 +/usr/bin/reindexdb 127.24 /usr/bin/vacuumdb 127.25 -/usr/bin/reindexdb
128.1 --- a/slang-dev/receipt Sat Apr 15 16:06:43 2017 +0300 128.2 +++ b/slang-dev/receipt Fri Apr 21 14:48:05 2017 +0300 128.3 @@ -3,20 +3,18 @@ 128.4 PACKAGE="slang-dev" 128.5 VERSION="2.2.4" 128.6 CATEGORY="development" 128.7 -SHORT_DESC="S-Lang library dev files" 128.8 +SHORT_DESC="S-Lang library (development files)" 128.9 MAINTAINER="erjo@slitaz.org" 128.10 LICENSE="GPL2" 128.11 +WEB_SITE="http://www.jedsoft.org/slang/" 128.12 + 128.13 WANTED="slang" 128.14 -WEB_SITE="http://www.s-lang.org/index.html" 128.15 - 128.16 -DEPENDS="slang pkg-config" 128.17 +DEPENDS="slang" 128.18 128.19 # Rules to gen a SliTaz package suitable for Tazpkg. 128.20 genpkg_rules() 128.21 { 128.22 - mkdir -p $fs/usr/lib 128.23 - cp -a $install/usr/include $fs/usr 128.24 - cp -a $install/usr/lib/*.*a $fs/usr/lib 128.25 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 128.26 + cook_copy_files *.h *.a *.pc 128.27 + cook_copy_folders slsh 128.28 + rm -r $fs/usr/share/doc 128.29 } 128.30 -
129.1 --- a/slang/receipt Sat Apr 15 16:06:43 2017 +0300 129.2 +++ b/slang/receipt Fri Apr 21 14:48:05 2017 +0300 129.3 @@ -6,30 +6,35 @@ 129.4 SHORT_DESC="S-Lang library" 129.5 MAINTAINER="erjo@slitaz.org" 129.6 LICENSE="GPL2" 129.7 -TARBALL="$PACKAGE-$VERSION.tar.gz" 129.8 -WEB_SITE="http://www.s-lang.org/index.html" 129.9 -WGET_URL="ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${VERSION%.*}/$TARBALL 129.10 - ftp://space.mit.edu/pub/davis/slang/v${VERSION%.*}/$TARBALL" 129.11 +WEB_SITE="http://www.jedsoft.org/slang/" 129.12 +CONFIG_FILES="/etc/slsh.rc" 129.13 129.14 -DEPENDS="pcre libpng zlib" 129.15 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 129.16 +WGET_URL="ftp://space.mit.edu/pub/davis/slang/v${VERSION%.*}/$TARBALL" 129.17 + 129.18 +DEPENDS="libpng ncurses oniguruma pcre readline zlib" 129.19 +BUILD_DEPENDS="pcre-dev oniguruma-dev libpng-dev zlib-dev readline-dev" 129.20 129.21 # Rules to configure and make the package. 129.22 compile_rules() 129.23 { 129.24 - cd $src 129.25 - ./configure --prefix=/usr $CONFIGURE_ARGS && 129.26 - make -j1 && \ 129.27 - make -j1 elf && \ 129.28 - make -j1 static && 129.29 - make -j1 DESTDIR=$DESTDIR install install-static 129.30 + ./configure \ 129.31 + --sysconfdir=/etc \ 129.32 + --with-readline=gnu \ 129.33 + $CONFIGURE_ARGS && 129.34 + make -j1 && 129.35 + make install_doc_dir=/usr/share/doc/slang-$VERSION \ 129.36 + SLSH_DOC_DIR=/usr/share/doc/slang-$VERSION/slsh \ 129.37 + install-all && 129.38 + 129.39 + chmod -v 755 \ 129.40 + $install/usr/lib/libslang.so.$VERSION \ 129.41 + $install/usr/lib/slang/v2/modules/*.so 129.42 } 129.43 129.44 # Rules to gen a SliTaz package suitable for Tazpkg. 129.45 genpkg_rules() 129.46 { 129.47 - mkdir -p $fs/usr/lib 129.48 - cp -a $install/usr/bin $fs/usr 129.49 - cp -a $install/usr/lib/*.so* $fs/usr/lib 129.50 - cp -a $install/usr/lib/slang $fs/usr/lib 129.51 + cook_copy_folders bin 129.52 + cook_copy_files *.so* 129.53 } 129.54 -
130.1 --- a/which/receipt Sat Apr 15 16:06:43 2017 +0300 130.2 +++ b/which/receipt Fri Apr 21 14:48:05 2017 +0300 130.3 @@ -1,36 +1,26 @@ 130.4 # SliTaz package receipt. 130.5 130.6 PACKAGE="which" 130.7 -VERSION="2.20" 130.8 +VERSION="2.21" 130.9 CATEGORY="base-system" 130.10 SHORT_DESC="A utility to show the full path of commands" 130.11 MAINTAINER="slaxemulator@gmail.com" 130.12 LICENSE="GPL3" 130.13 +WEB_SITE="https://savannah.gnu.org/projects/which/" 130.14 + 130.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 130.16 -WEB_SITE="http://www.xs4all.nl/~carlo17/which" 130.17 -WGET_URL="http://www.xs4all.nl/~carlo17/$PACKAGE/$TARBALL" 130.18 +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" 130.19 130.20 DEPENDS="glibc-base" 130.21 130.22 # Rules to configure and make the package. 130.23 compile_rules() 130.24 { 130.25 - ./configure \ 130.26 - --prefix=/usr \ 130.27 - --infodir=/usr/share/info \ 130.28 - --mandir=/usr/share/man \ 130.29 - $CONFIGURE_ARGS && 130.30 - make && make DESTDIR=$DESTDIR install 130.31 + ./configure $CONFIGURE_ARGS && make && make install 130.32 } 130.33 130.34 # Rules to gen a SliTaz package suitable for Tazpkg. 130.35 genpkg_rules() 130.36 { 130.37 - mkdir -p $fs/usr 130.38 - cp -a $install/usr/bin $fs/usr 130.39 + cook_copy_folders bin 130.40 } 130.41 - 130.42 -post_remove() 130.43 -{ 130.44 - ln -s /bin/busybox /usr/bin/which 130.45 -}