wok-next rev 20894
acl: up (2.2.53); add argon2; asunder: up (2.9.3); atk: up (2.28.1); attr: up (2.4.48); aufs-utils: up (20180705), still broken; cacerts: remake receipt; consolekit2: up (1.2.1); cryptsetup: up (2.0.3)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Jul 20 15:11:17 2018 +0300 (2018-07-20) |
parents | 751dc2b613cd |
children | ccb66c3dd643 |
files | acl/receipt argon2/receipt argon2/stuff/libargon2.pc asunder/receipt atk/receipt attr/receipt aufs-utils/receipt cacerts/receipt cacerts/stuff/remove_cnnic.patch consolekit2/receipt cryptsetup/receipt |
line diff
1.1 --- a/acl/receipt Fri Jul 20 08:15:10 2018 +0300 1.2 +++ b/acl/receipt Fri Jul 20 15:11:17 2018 +0300 1.3 @@ -1,15 +1,15 @@ 1.4 # SliTaz package receipt v2. 1.5 1.6 PACKAGE="acl" 1.7 -VERSION="2.2.52" 1.8 +VERSION="2.2.53" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="Commands for manipulating POSIX Access Control Lists" 1.11 MAINTAINER="rcx@zoominternet.net" 1.12 LICENSE="LGPL2.1 GPL2" 1.13 WEB_SITE="http://savannah.nongnu.org/projects/acl/" 1.14 -LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/acl.html" 1.15 +LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/acl.html" 1.16 1.17 -TARBALL="$PACKAGE-$VERSION.src.tar.gz" 1.18 +TARBALL="$PACKAGE-$VERSION.tar.gz" 1.19 WGET_URL="http://download.savannah.gnu.org/releases/acl/$TARBALL" 1.20 1.21 BUILD_DEPENDS="attr-dev bash libtool gettext" 1.22 @@ -17,9 +17,6 @@ 1.23 1.24 compile_rules() { 1.25 rm /bin/rpm 2>/dev/null 1.26 - sed -i -e 's|/@pkg_name@|&-@pkg_version@|' include/builddefs.in 1.27 - sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \ 1.28 - libacl/__acl_to_any_text.c 1.29 1.30 ./configure \ 1.31 --bindir=/bin \ 1.32 @@ -28,15 +25,12 @@ 1.33 $CONFIGURE_ARGS && 1.34 fix libtool && 1.35 make && 1.36 - make install install-lib install-dev DIST_ROOT=$DESTDIR || return 1 1.37 + make DESTDIR=$DESTDIR install || return 1 1.38 1.39 mkdir -p $install/lib 1.40 mv -v $install/usr/lib/libacl.so.* $install/lib 1.41 ln -sfv ../../lib/$(readlink $install/usr/lib/libacl.so) \ 1.42 $install/usr/lib/libacl.so 1.43 - 1.44 - find $install -type f \( -name '*.so*' -o -name '*.la' \) \ 1.45 - -exec chmod 755 \{\} \; 1.46 } 1.47 1.48 genpkg_rules() {
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/argon2/receipt Fri Jul 20 15:11:17 2018 +0300 2.3 @@ -0,0 +1,32 @@ 2.4 +# SliTaz package receipt v2. 2.5 + 2.6 +PACKAGE="argon2" 2.7 +VERSION="20171227" 2.8 +CATEGORY="security" 2.9 +SHORT_DESC="Password-hashing function (reference C implementation)" 2.10 +MAINTAINER="al.bobylev@gmail.com" 2.11 +LICENSE="Apache" 2.12 +WEB_SITE="https://github.com/P-H-C/phc-winner-argon2" 2.13 + 2.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 2.15 +WGET_URL="https://github.com/P-H-C/phc-winner-argon2/archive/$VERSION/$TARBALL" 2.16 + 2.17 +BUILD_DEPENDS="" 2.18 +SPLIT="argon2-dev" 2.19 + 2.20 +compile_rules() { 2.21 + # Make pkg-config file 2.22 + cp $stuff/libargon2.pc . 2.23 + sed -i "s|@VERSION@|$VERSION|" libargon2.pc 2.24 + 2.25 + make OPTTARGET=none && 2.26 + make OPTTARGET=none DESTDIR=$install install && 2.27 + install -Dm644 libargon2.pc $install/usr/lib/pkgconfig/libargon2.pc 2.28 +} 2.29 + 2.30 +genpkg_rules() { 2.31 + case $PACKAGE in 2.32 + argon2) copy @std;; 2.33 + *-dev) copy @dev;; 2.34 + esac 2.35 +}
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/argon2/stuff/libargon2.pc Fri Jul 20 15:11:17 2018 +0300 3.3 @@ -0,0 +1,11 @@ 3.4 +prefix=/usr 3.5 +exec_prefix=${prefix} 3.6 +libdir=${prefix}/lib 3.7 +includedir=${prefix}/include 3.8 + 3.9 +Name: libargon2 3.10 +Description: Development libraries for libargon2 3.11 +Version: @VERSION@ 3.12 +Libs: -L${libdir} -largon2 -lrt -ldl 3.13 +Cflags: 3.14 +URL: https://github.com/P-H-C/phc-winner-argon2
4.1 --- a/asunder/receipt Fri Jul 20 08:15:10 2018 +0300 4.2 +++ b/asunder/receipt Fri Jul 20 15:11:17 2018 +0300 4.3 @@ -1,24 +1,20 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="asunder" 4.8 -VERSION="2.7" 4.9 +VERSION="2.9.3" 4.10 CATEGORY="multimedia" 4.11 -SHORT_DESC="GTK light CD ripper." 4.12 +SHORT_DESC="GTK CD ripper and encoder" 4.13 MAINTAINER="pankso@slitaz.org" 4.14 LICENSE="GPL2" 4.15 -SUGGESTED="lame flac" 4.16 +WEB_SITE="http://littlesvr.ca/asunder/" 4.17 + 4.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 4.19 -WEB_SITE="http://littlesvr.ca/asunder/" 4.20 WGET_URL="$WEB_SITE/releases/$TARBALL" 4.21 -TAGS="audio rip" 4.22 4.23 -DEPENDS="atk gdk-pixbuf glib gtk+ libcddb" 4.24 BUILD_DEPENDS="gtk+-dev alsa-lib-dev libcddb-dev cdparanoia-III-dev \ 4.25 xorg-libXdamage-dev intltool" 4.26 4.27 -# Rules to configure and make the package. 4.28 -compile_rules() 4.29 -{ 4.30 +compile_rules() { 4.31 ./configure \ 4.32 --prefix=/usr \ 4.33 $CONFIGURE_ARGS && 4.34 @@ -26,9 +22,9 @@ 4.35 make DESTDIR=$DESTDIR install 4.36 } 4.37 4.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 4.39 -genpkg_rules() 4.40 -{ 4.41 - mkdir -p $fs/usr 4.42 - cp -a $install/usr/bin $fs/usr 4.43 +genpkg_rules() { 4.44 + copy @std 4.45 + DEPENDS="atk gdk-pixbuf glib gtk+ libcddb cdparanoia-III" 4.46 + SUGGESTED="lame flac" 4.47 + TAGS="audio rip" 4.48 }
5.1 --- a/atk/receipt Fri Jul 20 08:15:10 2018 +0300 5.2 +++ b/atk/receipt Fri Jul 20 15:11:17 2018 +0300 5.3 @@ -1,13 +1,13 @@ 5.4 # SliTaz package receipt v2. 5.5 5.6 PACKAGE="atk" 5.7 -VERSION="2.26.1" 5.8 +VERSION="2.28.1" 5.9 CATEGORY="x-window" 5.10 SHORT_DESC="Accessibility toolkit" 5.11 MAINTAINER="pankso@slitaz.org" 5.12 LICENSE="GPL2" 5.13 WEB_SITE="https://developer.gnome.org/atk/" 5.14 -LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/atk.html" 5.15 +LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/atk.html" 5.16 5.17 TARBALL="$PACKAGE-$VERSION.tar.xz" 5.18 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
6.1 --- a/attr/receipt Fri Jul 20 08:15:10 2018 +0300 6.2 +++ b/attr/receipt Fri Jul 20 15:11:17 2018 +0300 6.3 @@ -1,15 +1,15 @@ 6.4 # SliTaz package receipt v2. 6.5 6.6 PACKAGE="attr" 6.7 -VERSION="2.4.47" 6.8 +VERSION="2.4.48" 6.9 CATEGORY="system-tools" 6.10 SHORT_DESC="Commands for manipulating filesystem extended attributes" 6.11 MAINTAINER="rcx@zoominternet.net" 6.12 LICENSE="GPL2" 6.13 WEB_SITE="http://savannah.nongnu.org/projects/attr" 6.14 -LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/attr.html" 6.15 +LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/attr.html" 6.16 6.17 -TARBALL="$PACKAGE-$VERSION.src.tar.gz" 6.18 +TARBALL="$PACKAGE-$VERSION.tar.gz" 6.19 WGET_URL="http://download.savannah.gnu.org/releases/attr/$TARBALL" 6.20 6.21 BUILD_DEPENDS_arm=" " 6.22 @@ -18,7 +18,6 @@ 6.23 6.24 compile_rules() { 6.25 rm /bin/rpm >/dev/null 6.26 - sed -i -e 's|/@pkg_name@|&-@pkg_version@|' include/builddefs.in 6.27 6.28 ./configure \ 6.29 --bindir=/bin \ 6.30 @@ -26,15 +25,12 @@ 6.31 $CONFIGURE_ARGS && 6.32 fix libtool && 6.33 make && 6.34 - make install install-lib install-dev DIST_ROOT=$DESTDIR || return 1 6.35 + make DESTDIR=$DESTDIR install || return 1 6.36 6.37 mkdir -p $install/lib 6.38 mv $install/usr/lib/libattr.so.* $install/lib 6.39 ln -sf ../../lib/$(readlink $install/usr/lib/libattr.so) \ 6.40 $install/usr/lib/libattr.so 6.41 - 6.42 - find $install -type f \( -name '*.so*' -o -name '*.la' \) \ 6.43 - -exec chmod 755 \{\} \; 6.44 } 6.45 6.46 genpkg_rules() {
7.1 --- a/aufs-utils/receipt Fri Jul 20 08:15:10 2018 +0300 7.2 +++ b/aufs-utils/receipt Fri Jul 20 15:11:17 2018 +0300 7.3 @@ -1,36 +1,29 @@ 7.4 -# SliTaz package receipt. 7.5 +# SliTaz package receipt v2. 7.6 7.7 PACKAGE="aufs-utils" 7.8 -VERSION="20130311" 7.9 +VERSION="20180705" 7.10 CATEGORY="system-tools" 7.11 -SHORT_DESC="The aufs utils." 7.12 +SHORT_DESC="The aufs utils" 7.13 MAINTAINER="pankso@slitaz.org" 7.14 LICENSE="GPL2" 7.15 WEB_SITE="http://aufs.sourceforge.net/" 7.16 REPOLOGY="aufs-util" 7.17 7.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.19 -WGET_URL="git|git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git" 7.20 -BRANCH="origin/aufs3.0" 7.21 +WGET_URL="git|git://git.code.sf.net/p/aufs/aufs-util" 7.22 +BRANCH="aufs4.x-rcN" 7.23 7.24 -DEPENDS="aufs" 7.25 -BUILD_DEPENDS="git linux-module-headers aufs" 7.26 +BUILD_DEPENDS="git linux-module-headers aufs coreutils-operations" 7.27 +# coreutils-operations for 'install -T' in Makefile 7.28 7.29 -# Rules to configure and make the package. 7.30 -compile_rules() 7.31 -{ 7.32 +compile_rules() { 7.33 KERNEL_VERSION=$(. $WOK/linux/receipt; echo $VERSION) 7.34 - sed -i 's|.*AUFS_XINO_TRUNC_|// &|' c2tmac.c 7.35 - sed -i 's/-m 644 -T/-m 644/' Makefile 7.36 7.37 make && 7.38 make DESTDIR=$DESTDIR install 7.39 } 7.40 7.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.42 -genpkg_rules() 7.43 -{ 7.44 - mkdir -p $fs/usr 7.45 - cp -a $install/sbin $fs 7.46 - cp -a $install/usr/bin $fs/usr 7.47 +genpkg_rules() { 7.48 + copy @std 7.49 + DEPENDS="aufs" 7.50 }
8.1 --- a/cacerts/receipt Fri Jul 20 08:15:10 2018 +0300 8.2 +++ b/cacerts/receipt Fri Jul 20 15:11:17 2018 +0300 8.3 @@ -1,24 +1,44 @@ 8.4 # SliTaz package receipt v2. 8.5 8.6 -# This receipt will follow actual version on each recook 8.7 PACKAGE="cacerts" 8.8 -VERSION="20180309" 8.9 +VERSION="latest" 8.10 CATEGORY="security" 8.11 SHORT_DESC="Certificate Authority Certificates" 8.12 MAINTAINER="al.bobylev@gmail.com" 8.13 LICENSE="MPL2" 8.14 -WEB_SITE="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/cacerts.html" 8.15 +WEB_SITE="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/make-ca.html" 8.16 8.17 wget_url="https://hg.mozilla.org/releases/mozilla-release/raw-file/tip/security/nss/lib/ckfw/builtins/certdata.txt" 8.18 -#wget_url="http://anduin.linuxfromscratch.org/BLFS/other/certdata.txt" 8.19 8.20 BUILD_DEPENDS="perl openssl locale-en-base" 8.21 8.22 compile_rules() { 8.23 + mkdir -p $src 8.24 + cd $src 8.25 + wget $wget_url 8.26 + 8.27 + # Insert header (or process will fail) 8.28 + sed -i "1i\ 8.29 +#CVS_ID @# \$ RCSfile: certdata.txt \$ \$Revision: $date_Ymd \$ \$Date: \$" \ 8.30 + certdata.txt 8.31 + 8.32 + # Process... 8.33 + cp -a $stuff/* $src 8.34 + ./make-ca.sh && 8.35 + ./remove-expired-certs.sh $src/certs 8.36 + 8.37 + # "Installing" 8.38 + mkdir -p $install/etc/ssl/certs 8.39 + cp -a $src/certs/*.pem $install/etc/ssl/certs 8.40 + cp -a $src/ca-bundle.crt $install/etc/ssl 8.41 + ln -s ../ca-bundle.crt $install/etc/ssl/certs/ca-certificates.crt 8.42 +} 8.43 + 8.44 +genpkg_rules() { 8.45 # Determine date of certdata.txt 8.46 # FIXME: please point me to elegant way to determine this file timestamp 8.47 # in Mercurial. 8.48 - string=$(wget -O- ${wget_url/raw-/} | fgrep 'date age') 8.49 + string=$(wget -O- -q ${wget_url/raw-/} | fgrep 'date age') 8.50 # string example: 8.51 # <td class="date age">Thu, 28 Sep 2017 10:02:22 -0700</td> 8.52 date_d=$(echo "$string" | cut -d' ' -f5) 8.53 @@ -37,45 +57,9 @@ 8.54 Dec) date_m='12';; 8.55 esac 8.56 date_Y=$(echo "$string" | cut -d' ' -f7) 8.57 - date_Ymd="$date_Y$date_m$date_d" 8.58 8.59 - [ -f '/tmp/certdata.txt' ] && rm /tmp/certdata.txt 8.60 - wget -P/tmp $wget_url 8.61 + VERSION="$date_Y$date_m$date_d" 8.62 8.63 - # Insert header (or process will fail) 8.64 - sed -i "1i\ 8.65 -#CVS_ID @# \$ RCSfile: certdata.txt \$ \$Revision: $date_Ymd \$ \$Date: \$" \ 8.66 - /tmp/certdata.txt 8.67 - 8.68 - # VERSION=$(sed -n '/\$Revision:/s|.*Revision: \([0-9]*\).*$|\1|p' /tmp/certdata.txt) 8.69 - VERSION="$date_Ymd" 8.70 - echo -e "\nActual version: $VERSION\n" 8.71 - 8.72 - # Update receipt version 8.73 - sed -i "s|^VERSION=.*|VERSION=\"$VERSION\"|" $WOK/cacerts/receipt 8.74 - 8.75 - src="$WOK/cacerts/source/cacerts-$VERSION" 8.76 - mkdir -p $src 8.77 - mv /tmp/certdata.txt $src 8.78 - cd $src 8.79 - 8.80 - # Save certdata in $SRC 8.81 - TARBALL="$PACKAGE-$VERSION.txt" 8.82 - [ -e "$SRC/$TARBALL" ] || cp $src/certdata.txt $SRC/$TARBALL 8.83 - 8.84 - # Process... 8.85 - cp -a $stuff/* $src 8.86 - ./make-ca.sh && 8.87 - ./remove-expired-certs.sh $src/certs 8.88 - 8.89 - # "Installing" 8.90 - mkdir -p $install/etc/ssl/certs 8.91 - cp -a $src/certs/*.pem $install/etc/ssl/certs 8.92 - cp -a $src/ca-bundle.crt $install/etc/ssl 8.93 - ln -s ../ca-bundle.crt $install/etc/ssl/certs/ca-certificates.crt 8.94 -} 8.95 - 8.96 -genpkg_rules() { 8.97 copy @std 8.98 DEPENDS="openssl" 8.99 }
9.1 --- a/cacerts/stuff/remove_cnnic.patch Fri Jul 20 08:15:10 2018 +0300 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,7 +0,0 @@ 9.4 -# Remove CNNIC Root certificate (temporarily) 9.5 -# http://googleonlinesecurity.blogspot.com/2015/03/maintaining-digital-certificate-security.html 9.6 ---- a/certdata.txt 9.7 -+++ b/certdata.txt 9.8 -@@ -14889 +14889 @@ 9.9 --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR 9.10 -+CKA_TRUST_SERVER_AUTH TRUST_UNKNOWN
10.1 --- a/consolekit2/receipt Fri Jul 20 08:15:10 2018 +0300 10.2 +++ b/consolekit2/receipt Fri Jul 20 15:11:17 2018 +0300 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt v2. 10.5 10.6 PACKAGE="consolekit2" 10.7 -VERSION="1.0.2" 10.8 +VERSION="1.2.1" 10.9 CATEGORY="system-tools" 10.10 SHORT_DESC="ConsoleKit framework" 10.11 MAINTAINER="al.bobylev@gmail.com" 10.12 @@ -30,6 +30,8 @@ 10.13 make && 10.14 make install || return 1 10.15 10.16 + fix symlinks 10.17 + 10.18 mv -v $install/etc/X11/app-defaults/xinitrc.d/90-consolekit \ 10.19 $install/etc/X11/app-defaults/xinitrc.d/90-consolekit.sh 10.20 }
11.1 --- a/cryptsetup/receipt Fri Jul 20 08:15:10 2018 +0300 11.2 +++ b/cryptsetup/receipt Fri Jul 20 15:11:17 2018 +0300 11.3 @@ -1,7 +1,7 @@ 11.4 # SliTaz package receipt v2. 11.5 11.6 PACKAGE="cryptsetup" 11.7 -VERSION="1.7.5" 11.8 +VERSION="2.0.3" 11.9 CATEGORY="system-tools" 11.10 SHORT_DESC="dm-crypt setup tool for encryption of block devices" 11.11 MAINTAINER="b1+slitaz@nagel.org" 11.12 @@ -11,13 +11,16 @@ 11.13 TARBALL="$PACKAGE-$VERSION.tar.xz" 11.14 WGET_URL="https://www.kernel.org/pub/linux/utils/cryptsetup/v${VERSION%.*}/$TARBALL" 11.15 11.16 -BUILD_DEPENDS="util-linux-uuid-dev libdevmapper-dev popt-dev libgcrypt-dev" 11.17 +BUILD_DEPENDS="util-linux-uuid-dev libdevmapper-dev popt-dev libgcrypt-dev \ 11.18 +argon2-dev" 11.19 +BUILD_DEPENDS="util-linux-uuid-dev libdevmapper-dev gettext popt-dev json-c-dev \ 11.20 +libgcrypt-dev argon2-dev" 11.21 SPLIT="cryptsetup-dev" 11.22 11.23 compile_rules() { 11.24 ./configure \ 11.25 --disable-static \ 11.26 - --enable-cryptsetup-reencrypt \ 11.27 + --enable-libargon2 \ 11.28 $CONFIGURE_ARGS && 11.29 fix libtool && 11.30 make && 11.31 @@ -30,12 +33,10 @@ 11.32 case $PACKAGE in 11.33 cryptsetup) 11.34 copy @std 11.35 - DEPENDS="libdevmapper libgcrypt libgpg-error popt util-linux-uuid" 11.36 + DEPENDS="argon2 json-c libdevmapper libgcrypt popt util-linux-uuid" 11.37 ;; 11.38 *-dev) 11.39 copy @dev 11.40 - DEPENDS="cryptsetup libdevmapper-dev libgcrypt-dev \ 11.41 - libgpg-error-dev util-linux-uuid-dev" 11.42 ;; 11.43 esac 11.44 }