wok-next rev 20519
Synchronize wok-hg with wok. Some yesterday's patches are lost :(
line diff
1.1 --- a/8086tiny/receipt Fri Mar 23 09:21:17 2018 +0100 1.2 +++ b/8086tiny/receipt Fri Mar 23 10:45:35 2018 +0200 1.3 @@ -1,64 +1,48 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="8086tiny" 1.8 VERSION="1.25" 1.9 +COMMIT="c79ca2a" # no releases there in Github 1.10 CATEGORY="system-tools" 1.11 -SHORT_DESC="PC XT-compatible emulator/virtual machine." 1.12 +SHORT_DESC="PC XT-compatible emulator/virtual machine" 1.13 MAINTAINER="pascal.bellard@slitaz.org" 1.14 LICENSE="MIT" 1.15 -TARBALL="${PACKAGE}_${VERSION/./}.tar.bz2" 1.16 -WEB_SITE="http://www.megalith.co.uk/8086tiny" 1.17 -WGET_URL="$WEB_SITE/downloads/$TARBALL" 1.18 -TAGS="emulator 8086" 1.19 +WEB_SITE="https://github.com/adriancable/8086tiny" 1.20 1.21 -DEPENDS="libsdl" 1.22 +TARBALL="$PACKAGE-$VERSION.tar.gz" 1.23 +WGET_URL="$WEB_SITE/archive/$COMMIT.tar.gz" 1.24 + 1.25 +BUILD_DEPENDS_arm="libsdl-dev" 1.26 BUILD_DEPENDS="libsdl-dev nasm" 1.27 1.28 -# Handle cross compilation. 1.29 -case "$ARCH" in 1.30 - arm*) BUILD_DEPENDS="libsdl-dev" ;; 1.31 -esac 1.32 - 1.33 -# Rules to configure and make the package. 1.34 -compile_rules() 1.35 -{ 1.36 +compile_rules() { 1.37 case "$ARCH" in 1.38 - i?86) 1.39 + arm*) 1.40 + make CC=$HOST_SYSTEM-gcc 8086tiny_slowcpu 1.41 + nasm bios_source/bios.asm && 1.42 + echo "Skipping: strip: Unable to recognise the format" 1.43 + ;; 1.44 + *) 1.45 make CC=gcc no_graphics && 1.46 mv 8086tiny 8086tiny.nographics && 1.47 make CC=gcc && 1.48 - nasm bios_source/bios.asm ;; 1.49 - arm*) 1.50 - make CC=${HOST_SYSTEM}-gcc 8086tiny_slowcpu 1.51 - nasm bios_source/bios.asm && 1.52 - echo "Skipping: strip: Unable to recognise the format" ;; 1.53 - esac 1.54 + nasm bios_source/bios.asm 1.55 + ;; 1.56 + esac || return 1 1.57 + 1.58 + install -Dm755 $src/8086tiny $install/usr/bin/8086tiny 1.59 + [ -x "$src/8086tiny.nographics" ] && 1.60 + install -Dm755 $src/8086tiny.nographics $install/usr/bin/8086tiny.nographics 1.61 + install -Dm755 $stuff/8086tiny.sh $install/usr/bin/8086tiny.sh 1.62 + install -Dm644 $src/bios_source/bios $install/usr/share/8086tiny/bios 1.63 } 1.64 1.65 -# SliTaz package testsuite 1.66 testsuite() { 1.67 - readelf -Ah ${src}/8086tiny 1.68 + readelf -Ah $src/8086tiny 1.69 } 1.70 1.71 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.72 -genpkg_rules() 1.73 -{ 1.74 - mkdir -p $fs/usr/bin $fs/usr/share/8086tiny 1.75 - cp -a $src/8086tiny $fs/usr/bin 1.76 - [ -x "$src/8086tiny.nographics" ] && \ 1.77 - cp -a $src/8086tiny.nographics $fs/usr/bin 1.78 - cp -a $src/bios_source/bios $fs/usr/share/8086tiny 1.79 - cat > $fs/usr/bin/8086tiny.sh <<EOT 1.80 -#!/bin/sh 1.81 - 1.82 -if [ ! -e "\$1" ]; then 1.83 - echo "Usage: \$0 fd_image [hd_image]" 1.84 -else 1.85 - clear 1.86 - stty cbreak raw -echo min 0 1.87 - \${TINY8086:-/usr/bin/8086tiny} /usr/share/8086tiny/bios "\$@" 1.88 - stty cooked echo 1.89 -fi 1.90 -EOT 1.91 - chmod 755 $fs/usr/bin/8086tiny.sh 1.92 +genpkg_rules() { 1.93 + copy @std 1.94 + DEPENDS="libsdl" 1.95 + TAGS="emulator 8086" 1.96 }
2.1 --- a/arj/receipt Fri Mar 23 09:21:17 2018 +0100 2.2 +++ b/arj/receipt Fri Mar 23 10:45:35 2018 +0200 2.3 @@ -1,4 +1,4 @@ 2.4 -# SliTaz package receipt. 2.5 +# SliTaz package receipt v2. 2.6 2.7 PACKAGE="arj" 2.8 VERSION="3.10.22" 2.9 @@ -7,23 +7,20 @@ 2.10 MAINTAINER="pascal.bellard@slitaz.org" 2.11 LICENSE="GPL2" 2.12 WEB_SITE="http://arj.sourceforge.net/" 2.13 -TAGS="compression archive" 2.14 2.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 2.16 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 2.17 2.18 BUILD_DEPENDS="automake" 2.19 2.20 -# Rules to configure and make the package. 2.21 -compile_rules() 2.22 -{ 2.23 +compile_rules() { 2.24 cd $src/gnu 2.25 aclocal 2.26 autoconf 2.27 rm -f config.guess config.sub 2.28 - am="$(automake --version|head -n1|sed -r 's/.*\) (.*)/\1/')" 2.29 - cp /usr/share/automake-"$am"/config.guess . 2.30 - cp /usr/share/automake-"$am"/config.sub . 2.31 +# am=$(automake --version|head -n1|sed -r 's/.*\) (.*)/\1/') 2.32 + cp /usr/share/automake-*/config.guess . 2.33 + cp /usr/share/automake-*/config.sub . 2.34 2.35 ./configure $CONFIGURE_ARGS 2.36 cd .. 2.37 @@ -32,8 +29,7 @@ 2.38 make DESTDIR=$DESTDIR install 2.39 } 2.40 2.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.42 -genpkg_rules() 2.43 -{ 2.44 +genpkg_rules() { 2.45 copy @std 2.46 + TAGS="compression archive" 2.47 }
3.1 --- a/asterisk/receipt Fri Mar 23 09:21:17 2018 +0100 3.2 +++ b/asterisk/receipt Fri Mar 23 10:45:35 2018 +0200 3.3 @@ -3,14 +3,15 @@ 3.4 PACKAGE="asterisk" 3.5 VERSION="11.1.1" 3.6 CATEGORY="misc" 3.7 -SHORT_DESC="Open Source PBX and telephony toolkit." 3.8 +SHORT_DESC="Open Source PBX and telephony toolkit" 3.9 MAINTAINER="pascal.bellard@slitaz.org" 3.10 LICENSE="GPL2" 3.11 +WEB_SITE="http://www.asterisk.org/" 3.12 + 3.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.14 +WGET_URL="http://downloads.asterisk.org/pub/telephony/asterisk/releases/$TARBALL" 3.15 + 3.16 EXTRA_SOURCE_FILES="rfc3951.txt" 3.17 -WEB_SITE="http://www.asterisk.org/" 3.18 -WGET_URL="http://downloads.asterisk.org/pub/telephony/asterisk/releases/$TARBALL" 3.19 -TAGS="telephony" 3.20 3.21 BUILD_DEPENDS="gtk+-dev libxml2-dev postgresql-dev libsdl-dev ncurses-dev \ 3.22 gmime gmime-dev unixODBC-dev unixODBC openldap-dev openldap \ 3.23 @@ -26,8 +27,7 @@ 3.24 # 3.25 # Graphical configuration: 'make menuconfig' or 'make gmenuconfig' 3.26 # 3.27 -compile_rules() 3.28 -{ 3.29 +compile_rules() { 3.30 # according to https://issues.asterisk.org/jira/browse/ASTERISK-20576 3.31 # the message "Makefile:82: pjproject/build.mak: No such file or directory" is normal :-/ 3.32 sed -i 's/>no</>yes</' addons/[acor]*.c 3.33 @@ -42,13 +42,14 @@ 3.34 busybox sed -i 's|lua5.1/||' pbx/pbx_lua.c 3.35 grep -rsl '^#define AST_PBX_MAX_STACK' * | xargs busybox sed -i \ 3.36 's/define AST_PBX_MAX_STACK.*/define AST_PBX_MAX_STACK 1024/' 3.37 - [ -s $SRC/rfc3951.txt ] || 3.38 - wget -P $SRC http://www.ietf.org/rfc/rfc3951.txt 3.39 - cp $SRC/rfc3951.txt codecs/ilbc || 3.40 + [ -s $SOURCES_REPOSITORY/rfc3951.txt ] || 3.41 + wget -P $SOURCES_REPOSITORY http://www.ietf.org/rfc/rfc3951.txt 3.42 + cp $SOURCES_REPOSITORY/rfc3951.txt codecs/ilbc || 3.43 cp $stuff/rfc3951.txt codecs/ilbc 3.44 [ -f codecs/ilbc/iLBC_define.h ] || ( cd codecs/ilbc && 3.45 awk -f $stuff/extract-cfile.awk rfc3951.txt > /dev/null ) 3.46 mkdir -p $DESTDIR/usr/bin 3.47 +# export CXXFLAGS="$CXXFLAGS -fPIC" 3.48 ./configure \ 3.49 --prefix=/usr \ 3.50 --sysconfdir=/etc \ 3.51 @@ -63,30 +64,28 @@ 3.52 gcc rawplayer.c -o $DESTDIR/usr/bin/rawplayer 3.53 } 3.54 3.55 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.56 -genpkg_rules() 3.57 -{ 3.58 +genpkg_rules() { 3.59 case $PACKAGE in 3.60 - asterisk) 3.61 - CONFIG_FILES="/etc/asterisk" 3.62 - DEPENDS="openssl ncurses zlib libogg libvorbis curl newt \ 3.63 + asterisk) 3.64 + CONFIG_FILES="/etc/asterisk" 3.65 + DEPENDS="openssl ncurses zlib libogg libvorbis curl newt \ 3.66 libusb-compat alsa-lib speex iksemel spandsp tiff \ 3.67 radiusclient-ng nbs freetds libpostgresqlclient \ 3.68 libmysqlclient libunixODBC popt dahdi libpri lua \ 3.69 libcap attr net-snmp portaudio sqlite3 libkrb5 \ 3.70 libcomerr3 libsdl libsdl-image libxml2 bluez \ 3.71 libldap libical neon util-linux-uuid" 3.72 - mkdir -p $fs/usr 3.73 - cp -a $install/etc $fs 3.74 - cp -a $install/var $fs 3.75 - cp -a $install/usr/lib $fs/usr 3.76 - cp -a $install/usr/sbin $fs/usr 3.77 - cp -a $stuff/*/ $fs 3.78 - ;; 3.79 - asterisk-dev) 3.80 - mkdir -p $fs/usr 3.81 - cp -a $install/usr/include $fs/usr 3.82 - ;; 3.83 + mkdir -p $fs/usr 3.84 + cp -a $install/etc $fs 3.85 + cp -a $install/var $fs 3.86 + cp -a $install/usr/lib $fs/usr 3.87 + cp -a $install/usr/sbin $fs/usr 3.88 + cp -a $stuff/*/ $fs 3.89 + TAGS="telephony" 3.90 + ;; 3.91 + asterisk-dev) 3.92 + copy @dev 3.93 + ;; 3.94 esac 3.95 } 3.96
4.1 --- a/audacity/receipt Fri Mar 23 09:21:17 2018 +0100 4.2 +++ b/audacity/receipt Fri Mar 23 10:45:35 2018 +0200 4.3 @@ -1,4 +1,4 @@ 4.4 -# SliTaz package receipt. 4.5 +# SliTaz package receipt v2. 4.6 4.7 PACKAGE="audacity" 4.8 VERSION="2.1.3" 4.9 @@ -7,34 +7,24 @@ 4.10 MAINTAINER="allan316@gmail.com" 4.11 LICENSE="GPL2" 4.12 WEB_SITE="http://www.audacityteam.org/" 4.13 + 4.14 TARBALL="Audacity-$VERSION.tar.gz" 4.15 WGET_URL="https://github.com/audacity/audacity/archive/$TARBALL" 4.16 -TAGS="sound audio recorder editor" 4.17 4.18 -DEPENDS="wxWidgets ffmpeg libvorbis imlib2 libid3tag libmad flac libsndfile \ 4.19 -lame alsa-lib xorg-libXxf86vm" 4.20 BUILD_DEPENDS="wxWidgets-dev ffmpeg-dev libvorbis-dev libmad-dev flac-dev \ 4.21 -libsndfile-dev lame-dev alsa-lib-dev portaudio-dev cmake expat-dev gettext-tools" 4.22 +libsndfile-dev lame-dev alsa-lib-dev portaudio-dev cmake expat-dev \ 4.23 +gettext-tools" 4.24 4.25 -# Rules to configure and make the package. 4.26 -compile_rules() 4.27 -{ 4.28 +compile_rules() { 4.29 ./configure \ 4.30 - --prefix=/usr \ 4.31 - --infodir=/usr/share/info \ 4.32 - --mandir=/usr/share/man \ 4.33 --with-ffmpeg=local \ 4.34 $CONFIGURE_ARGS && 4.35 make && 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 $fs/usr/share 4.42 - cp -a $install/usr/bin $fs/usr 4.43 - cp -a $install/usr/share/icons $fs/usr/share 4.44 - cp -a $install/usr/share/audacity $fs/usr/share 4.45 - cp -a $install/usr/share/pixmaps $fs/usr/share 4.46 - cp -a $install/usr/share/applications $fs/usr/share 4.47 +genpkg_rules() { 4.48 + copy @std 4.49 + DEPENDS="wxWidgets ffmpeg libvorbis imlib2 libid3tag libmad flac \ 4.50 + libsndfile lame alsa-lib xorg-libXxf86vm" 4.51 + TAGS="sound audio recorder editor" 4.52 }
5.1 --- a/busybox/receipt Fri Mar 23 09:21:17 2018 +0100 5.2 +++ b/busybox/receipt Fri Mar 23 10:45:35 2018 +0200 5.3 @@ -12,7 +12,7 @@ 5.4 WGET_URL="${WEB_SITE}downloads/$TARBALL" 5.5 5.6 BUILD_DEPENDS_arm="bzip2" 5.7 -BUILD_DEPENDS="patch bzip2 gettext perl pam-dev" # uclibc-cross-compiler-i486 musl-libc-dev dietlibc 5.8 +BUILD_DEPENDS="patch bzip2 gettext perl pam-dev libtirpc-dev" # uclibc-cross-compiler-i486 musl-libc-dev dietlibc 5.9 case "$ARCH" in 5.10 arm*) SPLIT='';; 5.11 x86_64) SPLIT="busybox busybox-pam:pam";; 5.12 @@ -33,6 +33,7 @@ 5.13 esac 5.14 5.15 # Next both for i?86 and x86_64 native compilation 5.16 + export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libtirpc)" 5.17 case "$SET" in 5.18 '') 5.19 cp $stuff/.config $src
6.1 --- a/c-client/receipt Fri Mar 23 09:21:17 2018 +0100 6.2 +++ b/c-client/receipt Fri Mar 23 10:45:35 2018 +0200 6.3 @@ -1,35 +1,39 @@ 6.4 -# SliTaz package receipt. 6.5 +# SliTaz package receipt v2. 6.6 6.7 PACKAGE="c-client" 6.8 VERSION="2007f" 6.9 CATEGORY="development" 6.10 -SHORT_DESC="mail store formats support." 6.11 +SHORT_DESC="Mail store formats support" 6.12 MAINTAINER="pascal.bellard@slitaz.org" 6.13 LICENSE="Apache" 6.14 WEB_SITE="http://www.washington.edu/imap/" 6.15 -SOURCE="imap" 6.16 -TARBALL="$SOURCE-$VERSION.tar.gz" 6.17 -WGET_URL="ftp://ftp.cac.washington.edu/mail/$TARBALL" 6.18 -TAGS="imap pop3 smtp" 6.19 6.20 -BUILD_DEPENDS="openssl-dev" 6.21 +TARBALL="imap-$VERSION.tar.gz" 6.22 +WGET_URL="https://www.mirrorservice.org/sites/ftp.cac.washington.edu/imap/$TARBALL" 6.23 6.24 -# Rules to configure and make the package. 6.25 -compile_rules() 6.26 -{ 6.27 - cd $src 6.28 - sed -i 's|SSLCFLAGS)|SSLCFLAGS) -I/usr/include/openssl|' \ 6.29 - src/osdep/unix/Makefile 6.30 +BUILD_DEPENDS="openssl-dev krb5-dev pam-dev" 6.31 +COOKOPTS="skip-log-errors" 6.32 + 6.33 +compile_rules() { 6.34 + sed \ 6.35 + -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \ 6.36 + -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \ 6.37 + -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \ 6.38 + -i src/osdep/unix/Makefile 6.39 + 6.40 make slx 6.41 - mkdir -p $DESTDIR/usr/include/c-client $DESTDIR/usr/lib 6.42 + 6.43 + mkdir -p \ 6.44 + $DESTDIR/usr/include/c-client \ 6.45 + $DESTDIR/usr/lib 6.46 cp src/c-client/*.h c-client/linkage.h c-client/osdep.h c-client/env_unix.h \ 6.47 $DESTDIR/usr/include/c-client 6.48 cp c-client/c-client.a $DESTDIR/usr/lib 6.49 + 6.50 + chown -R root:root $install 6.51 } 6.52 6.53 -# Rules to gen a SliTaz package suitable for Tazpkg. 6.54 -genpkg_rules() 6.55 -{ 6.56 - cp -a $install/* $fs 6.57 - chown -R root:root $fs 6.58 +genpkg_rules() { 6.59 + copy @dev 6.60 + TAGS="imap pop3 smtp" 6.61 }
7.1 --- a/cairo-dock-plugins/receipt Fri Mar 23 09:21:17 2018 +0100 7.2 +++ b/cairo-dock-plugins/receipt Fri Mar 23 10:45:35 2018 +0200 7.3 @@ -3,31 +3,30 @@ 7.4 PACKAGE="cairo-dock-plugins" 7.5 VERSION="3.3.2" 7.6 CATEGORY="x-window" 7.7 -SHORT_DESC="Set of plugins for Cairo-Dock." 7.8 +SHORT_DESC="Set of plugins for Cairo-Dock" 7.9 MAINTAINER="pankso@slitaz.org" 7.10 LICENSE="GPL3" 7.11 +WEB_SITE="http://www.glx-dock.org/" 7.12 + 7.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 7.14 -WEB_SITE="http://www.glx-dock.org/" 7.15 WGET_URL="https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/$VERSION.tar" 7.16 7.17 -DEPENDS="dbus-glib cairo-dock" 7.18 -BUILD_DEPENDS="dbus-glib-dev cairo-dock-dev cmake alsa-lib \ 7.19 +BUILD_DEPENDS="wget dbus-glib-dev cairo-dock-dev cmake alsa-lib \ 7.20 gtk+-dev cairo-dev librsvg-dev dbus-dev libxml2-dev gtkglext-dev mesa-dev \ 7.21 -xorg-libXtst-dev xorg-libXcomposite-dev alsa-lib-dev libical-dev glu-dev" 7.22 +xorg-libXtst-dev xorg-libXcomposite-dev alsa-lib-dev libical-dev glu-dev \ 7.23 +libdbusmenu-gtk2-dev libindicator-gtk2-dev gnome-menus-dev" 7.24 7.25 -# Rules to configure and make the package. 7.26 -compile_rules() 7.27 -{ 7.28 - mkdir -p build && cd build 7.29 - cmake .. -DCMAKE_INSTALL_PREFIX=/usr && 7.30 +compile_rules() { 7.31 + mkdir build 7.32 + cd build 7.33 + cmake \ 7.34 + -DCMAKE_INSTALL_PREFIX=/usr \ 7.35 + .. && 7.36 make && 7.37 make DESTDIR=$DESTDIR install 7.38 } 7.39 7.40 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.41 -genpkg_rules() 7.42 -{ 7.43 - mkdir -p $fs/usr/lib $fs/usr/share 7.44 - cp -a $install/usr/lib $fs/usr 7.45 - cp -a $install/usr/share/cairo-dock $fs/usr/share 7.46 +genpkg_rules() { 7.47 + copy @std 7.48 + DEPENDS="dbus-glib cairo-dock" 7.49 }
8.1 --- a/claws-mail/receipt Fri Mar 23 09:21:17 2018 +0100 8.2 +++ b/claws-mail/receipt Fri Mar 23 10:45:35 2018 +0200 8.3 @@ -15,7 +15,7 @@ 8.4 startup-notification-dev dbus-dev dbus-glib-dev openldap-dev librsvg-dev \ 8.5 libetpan-dev curl-dev expat-dev webkitgtk-dev libsoup-dev libarchive-dev \ 8.6 libical-dev poppler-dev gpgme-dev python-dev pygtk-dev libcanberra-dev \ 8.7 -ytnef-dev libnotify-dev perl-dev lcms2-dev" 8.8 +ytnef-dev libnotify-dev perl-dev lcms2-dev xorg-xcb-util-dev" 8.9 cm='claws-mail' 8.10 SPLIT="\ 8.11 $cm-acpinotifier $cm-addresskeeper $cm-archive $cm-attachwarner \
9.1 --- a/compiz-compizconfig-python/receipt Fri Mar 23 09:21:17 2018 +0100 9.2 +++ b/compiz-compizconfig-python/receipt Fri Mar 23 10:45:35 2018 +0200 9.3 @@ -1,31 +1,27 @@ 9.4 -# SliTaz package receipt. 9.5 +# SliTaz package receipt v2. 9.6 9.7 PACKAGE="compiz-compizconfig-python" 9.8 VERSION="0.8.12.1" 9.9 CATEGORY="x-window" 9.10 -SHORT_DESC="Compiz Config Python module." 9.11 +SHORT_DESC="Compiz Config Python module" 9.12 MAINTAINER="pankso@slitaz.org" 9.13 LICENSE="GPL2" 9.14 -SOURCE="${PACKAGE/compiz-/}" 9.15 -TARBALL="$SOURCE-$VERSION.tar.xz" 9.16 WEB_SITE="https://github.com/compiz-reloaded" 9.17 -WGET_URL="$WEB_SITE/$SOURCE/releases/download/v$VERSION/$TARBALL" 9.18 9.19 -DEPENDS="python compiz-core compiz-libcompizconfig" 9.20 -BUILD_DEPENDS="$DEPENDS python-dev pygtk-dev compiz-core-dev protobuf-dev \ 9.21 -compiz-libcompizconfig-dev python-cython libxslt-dev util-linux-uuid-dev \ 9.22 -startup-notification-dev libtool xorg-dev glib-dev" 9.23 +TARBALL="compizconfig-python-$VERSION.tar.xz" 9.24 +WGET_URL="$WEB_SITE/compizconfig-python/releases/download/v$VERSION/$TARBALL" 9.25 9.26 -# Rules to configure and make the package. 9.27 -compile_rules() 9.28 -{ 9.29 - ./configure --prefix=/usr 9.30 - make && make install 9.31 +BUILD_DEPENDS="compiz-libcompizconfig-dev glib-dev compiz-core-dev \ 9.32 +xorg-libX11-dev xorg-libXcomposite-dev xorg-libXext-dev xorg-libXdamage-dev \ 9.33 +xorg-libXrandr-dev xorg-libXi-dev xorg-libXinerama-dev xorg-libXcursor-dev \ 9.34 +xorg-libICE-dev xorg-libSM-dev libxml2-dev startup-notification-dev \ 9.35 +python-cython python-dev xorg-xcb-util-dev" 9.36 + 9.37 +compile_rules() { 9.38 + ./configure $CONFIGURE_ARGS && make && make install 9.39 } 9.40 9.41 -# Rules to gen a SliTaz package suitable for Tazpkg. 9.42 -genpkg_rules() 9.43 -{ 9.44 - mkdir -p $fs 9.45 - cp -a $install/usr $fs 9.46 +genpkg_rules() { 9.47 + copy @std 9.48 + DEPENDS="python compiz-core compiz-libcompizconfig" 9.49 }
10.1 --- a/conky/receipt Fri Mar 23 09:21:17 2018 +0100 10.2 +++ b/conky/receipt Fri Mar 23 10:45:35 2018 +0200 10.3 @@ -1,27 +1,22 @@ 10.4 -# SliTaz package receipt. 10.5 +# SliTaz package receipt v2. 10.6 10.7 PACKAGE="conky" 10.8 VERSION="1.9.0" 10.9 CATEGORY="system-tools" 10.10 -SHORT_DESC="Simple and very light system monitor." 10.11 +SHORT_DESC="Simple and very light system monitor" 10.12 MAINTAINER="pankso@slitaz.org" 10.13 LICENSE="GPL3" 10.14 +WEB_SITE="http://conky.sourceforge.net/" 10.15 + 10.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 10.17 -WEB_SITE="http://conky.sourceforge.net/" 10.18 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 10.19 -TAGS="desktop monitoring" 10.20 10.21 -DEPENDS="expat fontconfig freetype glib xorg-libX11 xorg-libXau \ 10.22 -xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libxcb \ 10.23 -xorg-libXft xorg-libXrender zlib ncurses wireless_tools imlib2" 10.24 BUILD_DEPENDS="xorg-libXdamage-dev xorg-libXft-dev fontconfig-dev \ 10.25 -expat-dev glib glib-dev zlib-dev freetype-dev xorg-xextproto \ 10.26 +expat-dev glib glib-dev pkg-config zlib-dev freetype-dev xorg-xextproto \ 10.27 xorg-damageproto xorg-fixesproto ncurses-dev xorg-libxcb-dev wireless_tools-dev \ 10.28 -imlib2-dev lua-dev" 10.29 +imlib2-dev lua-dev xorg-libXext-dev" 10.30 10.31 -# Rules to configure and make the package. 10.32 -compile_rules() 10.33 -{ 10.34 +compile_rules() { 10.35 ./configure \ 10.36 --prefix=/usr \ 10.37 --sysconfdir=/etc \ 10.38 @@ -32,12 +27,14 @@ 10.39 make && make install 10.40 } 10.41 10.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 10.43 -genpkg_rules() 10.44 -{ 10.45 +genpkg_rules() { 10.46 mkdir -p $fs/usr $fs/etc/conky $fs/etc/xdg/autostart 10.47 cp -a $install/usr/bin $fs/usr 10.48 cp -f $install/etc/conky/conky_no_x11.conf $fs/etc/conky 10.49 cp -a $stuff/conky.conf $fs/etc/conky 10.50 cp -a $stuff/conky.desktop $fs/etc/xdg/autostart 10.51 + DEPENDS="expat fontconfig freetype glib xorg-libX11 xorg-libXau \ 10.52 + xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libxcb \ 10.53 + xorg-libXft xorg-libXrender zlib ncurses wireless_tools imlib2" 10.54 + TAGS="desktop monitoring" 10.55 }
11.1 --- a/cookutils/receipt Fri Mar 23 09:21:17 2018 +0100 11.2 +++ b/cookutils/receipt Fri Mar 23 10:45:35 2018 +0200 11.3 @@ -1,7 +1,7 @@ 11.4 # SliTaz package receipt v2. 11.5 11.6 PACKAGE="cookutils" 11.7 -VERSION="1039" 11.8 +VERSION="1040" 11.9 CATEGORY="base-system" 11.10 SHORT_DESC="SliTaz packages builder new generation" 11.11 MAINTAINER="pankso@slitaz.org"
12.1 --- a/distcc/receipt Fri Mar 23 09:21:17 2018 +0100 12.2 +++ b/distcc/receipt Fri Mar 23 10:45:35 2018 +0200 12.3 @@ -1,23 +1,21 @@ 12.4 # SliTaz package receipt v2. 12.5 12.6 PACKAGE="distcc" 12.7 -VERSION="3.1" 12.8 +VERSION="3.3" 12.9 CATEGORY="development" 12.10 SHORT_DESC="Distributed compilation for C/C++" 12.11 MAINTAINER="erjo@slitaz.org" 12.12 LICENSE="GPL2" 12.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 12.14 -WEB_SITE="http://distcc.org" 12.15 -WGET_URL="http://distcc.googlecode.com/files/$TARBALL" 12.16 +WEB_SITE="https://github.com/distcc/distcc" 12.17 12.18 -DEPENDS="popt lzo" 12.19 +TARBALL="$PACKAGE-$VERSION.tar.gz" 12.20 +WGET_URL="https://github.com/distcc/distcc/releases/download/v$VERSION/$TARBALL" 12.21 + 12.22 BUILD_DEPENDS="popt-dev lzo-dev python-dev gtk+-dev libgnome-dev \ 12.23 libgnomeui-dev libbonoboui-dev libgnomecanvas-dev libgnome-keyring-dev" 12.24 SPLIT="distcc distccmon-gui" 12.25 12.26 -# Rules to configure and make the package. 12.27 -compile_rules() 12.28 -{ 12.29 +compile_rules() { 12.30 export CFLAGS="-Wno-error=unused-but-set-variable -Wno-unused-local-typedefs" 12.31 ./configure \ 12.32 --prefix=/usr \ 12.33 @@ -29,56 +27,55 @@ 12.34 make && make DESTDIR=$DESTDIR install 12.35 } 12.36 12.37 -# Rules to gen a SliTaz package suitable for Tazpkg. 12.38 -genpkg_rules() 12.39 -{ 12.40 +genpkg_rules() { 12.41 case $PACKAGE in 12.42 - distcc) 12.43 - mkdir -p $fs/usr \ 12.44 - $fs/var/log/distccd \ 12.45 - $fs/etc/init.d 12.46 - 12.47 - cp -a $install/usr/bin $fs/usr 12.48 - cp -a $install/etc/distcc $fs/etc 12.49 - 12.50 - echo '127.0.0.1' >> $fs/etc/distcc/clients.allow 12.51 - 12.52 - install -o root -g root $stuff/distccd $fs/etc/init.d 12.53 - ;; 12.54 - distccmon-gui) 12.55 - CAT="development|Distcc monitor GUI." 12.56 - DEPENDS="gtk+ distcc" 12.57 - mkdir -p $fs/usr/bin \ 12.58 - $fs/usr/share/applications \ 12.59 - $fs/usr/share/pixmaps 12.60 - cp -a $install/usr/bin/distccmon-gnome \ 12.61 - $fs/usr/bin/distccmon-gui 12.62 - cp -a $install/usr/share/distcc/distccmon-gnome-icon.png \ 12.63 - $fs/usr/share/pixmaps/distccmon-gui.png 12.64 - cp stuff/*.desktop $fs/usr/share/applications 12.65 - ;; 12.66 + distcc) 12.67 + mkdir -p $fs/usr \ 12.68 + $fs/var/log/distccd \ 12.69 + $fs/etc/init.d 12.70 + 12.71 + cp -a $install/usr/bin $fs/usr 12.72 + cp -a $install/etc/distcc $fs/etc 12.73 + 12.74 + echo '127.0.0.1' >> $fs/etc/distcc/clients.allow 12.75 + 12.76 + install -o root -g root $stuff/distccd $fs/etc/init.d 12.77 + DEPENDS="popt lzo" 12.78 + ;; 12.79 + distccmon-gui) 12.80 + CAT="development|GUI monitor" 12.81 + DEPENDS="gtk+ distcc" 12.82 + mkdir -p $fs/usr/bin \ 12.83 + $fs/usr/share/applications \ 12.84 + $fs/usr/share/pixmaps 12.85 + cp -a $install/usr/bin/distccmon-gnome \ 12.86 + $fs/usr/bin/distccmon-gui 12.87 + cp -a $install/usr/share/distcc/distccmon-gnome-icon.png \ 12.88 + $fs/usr/share/pixmaps/distccmon-gui.png 12.89 + cp stuff/*.desktop $fs/usr/share/applications 12.90 + ;; 12.91 esac 12.92 } 12.93 12.94 -post_install_distcc() 12.95 -{ 12.96 - if ! grep -q nagios "$1/etc/passwd"; then 12.97 - echo -n "Adding user/group nagios..." 12.98 +post_install_distcc() { 12.99 + if ! grep -q distcc "$1/etc/passwd"; then 12.100 chroot "$1/" addgroup -S distcc 12.101 chroot "$1/" adduser -S -D -H -G distcc distcc 12.102 - status 12.103 fi 12.104 - 12.105 + 12.106 # Fix perms for files and directories 12.107 chroot "$1/" chown -R distcc.distcc /var/log/distccd 12.108 - 12.109 + 12.110 cat <<EOF 12.111 ----- 12.112 -Now you can: 12.113 -* Just run '/etc/init.d/distccd start' to start daemon. 12.114 -* Add distccd to RUN_DAEMONS in /etc/rcS.conf to run distccd à at boot time. 12.115 -* Allow cliets in /etc/distcc/clients.allow 12.116 ----- 12.117 + 12.118 + .---------------------------------------------------------. 12.119 + | Now you can: | 12.120 + | | 12.121 + | * Just run '/etc/init.d/distccd start' to start daemon. | 12.122 + | * Add distccd to RUN_DAEMONS in /etc/rcS.conf | 12.123 + | to run distccd at boot time. | 12.124 + | * Allow cliets in /etc/distcc/clients.allow | 12.125 + '---------------------------------------------------------' 12.126 12.127 EOF 12.128 }
13.1 --- a/duktape/receipt Fri Mar 23 09:21:17 2018 +0100 13.2 +++ b/duktape/receipt Fri Mar 23 10:45:35 2018 +0200 13.3 @@ -1,7 +1,7 @@ 13.4 # SliTaz package receipt v2. 13.5 13.6 PACKAGE="duktape" 13.7 -VERSION="2.1.1" 13.8 +VERSION="2.2.0" 13.9 CATEGORY="libs" 13.10 SHORT_DESC="Embeddable Javascript engine" 13.11 MAINTAINER="al.bobylev@gmail.com" 13.12 @@ -20,9 +20,12 @@ 13.13 cp $stuff/duktape.pc . 13.14 sed -i "s|@@VERSION@@|$VERSION|" duktape.pc 13.15 13.16 - CFLAGS="$CFLAGS -D DUK_USE_FASTINT -w" make 13.17 + CFLAGS="$CFLAGS -D DUK_USE_FASTINT -w" \ 13.18 + make 13.19 13.20 - mkdir -p $install/usr/lib/pkgconfig $install/usr/include 13.21 + mkdir -p \ 13.22 + $install/usr/lib/pkgconfig/ \ 13.23 + $install/usr/include/ 13.24 make install 13.25 cp duktape.pc $install/usr/lib/pkgconfig/ 13.26 }
14.1 --- a/ecm/receipt Fri Mar 23 09:21:17 2018 +0100 14.2 +++ b/ecm/receipt Fri Mar 23 10:45:35 2018 +0200 14.3 @@ -12,7 +12,7 @@ 14.4 TARBALL="cmdpack-$VERSION-src.tar.gz" 14.5 WGET_URL="http://www.neillcorlett.com/downloads/$TARBALL" 14.6 14.7 -SPLIT="ecm-extras" 14.8 +SPLIT="ecm ecm-extras" 14.9 14.10 compile_rules() { 14.11 cd $src/src 14.12 @@ -23,21 +23,18 @@ 14.13 ./mkgcc ${i%.c} || return 1 14.14 cp -a ${i%.c} $DESTDIR/usr/bin 14.15 done 14.16 + 14.17 + ln -sf ecm $install/usr/bin/unecm 14.18 } 14.19 14.20 genpkg_rules() { 14.21 case $PACKAGE in 14.22 ecm) 14.23 - mkdir -p $fs/usr/bin 14.24 - cp -a $install/usr/bin/ecm $fs/usr/bin 14.25 - ln -sf ecm $fs/usr/bin/unecm 14.26 + copy ecm unecm 14.27 ;; 14.28 ecm-extras) 14.29 - mkdir -p $fs/usr 14.30 - cp -a $install/usr/bin $fs/usr 14.31 - [ -f $fs/usr/bin/ecm ] && rm -f $fs/usr/bin/ecm 14.32 + copy @std @rm 14.33 CAT="misc|extra tools" 14.34 ;; 14.35 esac 14.36 } 14.37 -
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/ecm/stuff/patches/gcc7.patch Fri Mar 23 10:45:35 2018 +0200 15.3 @@ -0,0 +1,18 @@ 15.4 +--- a/src/hax65816.c 15.5 ++++ b/src/hax65816.c 15.6 +@@ -209,6 +209,7 @@ 15.7 + q = 2; 15.8 + break; 15.9 + } 15.10 ++ /* FALLTHROUGH */ 15.11 + default: 15.12 + unfetchbyte(n[1]); 15.13 + q = 1; 15.14 +@@ -232,6 +233,7 @@ 15.15 + q = 1; 15.16 + break; 15.17 + } 15.18 ++ /* FALLTHROUGH */ 15.19 + default: 15.20 + unfetchbyte(n[2]); 15.21 + q = 2;
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/ecm/stuff/patches/series Fri Mar 23 10:45:35 2018 +0200 16.3 @@ -0,0 +1,1 @@ 16.4 +gcc7.patch
17.1 --- a/exiv2/receipt Fri Mar 23 09:21:17 2018 +0100 17.2 +++ b/exiv2/receipt Fri Mar 23 10:45:35 2018 +0200 17.3 @@ -15,9 +15,7 @@ 17.4 BUILD_DEPENDS="gettext zlib-dev expat-dev curl-dev libssh-dev" 17.5 SPLIT="exiv2-dev" 17.6 17.7 -# Rules to configure and make the package. 17.8 -compile_rules() 17.9 -{ 17.10 +compile_rules() { 17.11 ./configure \ 17.12 --enable-video \ 17.13 --enable-webready \ 17.14 @@ -25,9 +23,7 @@ 17.15 make && make install 17.16 } 17.17 17.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 17.19 -genpkg_rules() 17.20 -{ 17.21 +genpkg_rules() { 17.22 case $PACKAGE in 17.23 exiv2) 17.24 copy @std 17.25 @@ -35,8 +31,8 @@ 17.26 ;; 17.27 exiv2-dev) 17.28 copy @dev 17.29 - DEPENDS="curl-dev expat-dev libssh-dev openssl-dev \ 17.30 - zlib-dev" 17.31 + DEPENDS="curl-dev expat-dev libssh-dev zlib-dev" 17.32 + # + openssl-dev depending on libssh 17.33 ;; 17.34 esac 17.35 }
18.1 --- a/flmusic/receipt Fri Mar 23 09:21:17 2018 +0100 18.2 +++ b/flmusic/receipt Fri Mar 23 10:45:35 2018 +0200 18.3 @@ -1,4 +1,4 @@ 18.4 -# SliTaz package receipt 18.5 +# SliTaz package receipt v2. 18.6 18.7 PACKAGE="flmusic" 18.8 VERSION="1.2.1" 18.9 @@ -6,29 +6,27 @@ 18.10 SHORT_DESC="FLTK Audio player" 18.11 MAINTAINER="pankso@slitaz.org" 18.12 LICENSE="GPL" 18.13 +WEB_SITE="http://home.arcor.de/szukw000/english_index.html" 18.14 + 18.15 TARBALL="$PACKAGE-fltk13-source-$VERSION.tgz" 18.16 -WEB_SITE="http://home.arcor.de/szukw000/english_index.html" 18.17 WGET_URL="http://home.arcor.de/szukw000/$TARBALL" 18.18 18.19 -DEPENDS="fltk alsa-lib sox" 18.20 -BUILD_DEPENDS="fltk-dev alsa-lib-dev sox-dev" 18.21 +BUILD_DEPENDS="fltk-dev alsa-lib-dev sox-dev xorg-libX11-dev" 18.22 18.23 -# Rules to configure and make the package. 18.24 -compile_rules() 18.25 -{ 18.26 +compile_rules() { 18.27 #sed -i '/ioctl.h/a #include <limits.h>' reader.c && 18.28 sed -i 's/$(installdir)/$(DESTDIR)$(installdir)/' \ 18.29 Makefile.in || return 1 18.30 chmod +x configure && 18.31 - ./configure --prefix=/usr \ 18.32 - $CONFIGURE_ARGS && 18.33 - make && mkdir -p $DESTDIR/usr/bin && 18.34 + ./configure \ 18.35 + --prefix=/usr \ 18.36 + $CONFIGURE_ARGS && 18.37 + make && 18.38 + mkdir -p $DESTDIR/usr/bin && 18.39 make DESTDIR=$DESTDIR install 18.40 } 18.41 18.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 18.43 -genpkg_rules() 18.44 -{ 18.45 - mkdir -p $fs/usr 18.46 - cp -a $install/usr/bin $fs/usr 18.47 +genpkg_rules() { 18.48 + copy @std 18.49 + DEPENDS="fltk alsa-lib sox" 18.50 }
19.1 --- a/flrec/receipt Fri Mar 23 09:21:17 2018 +0100 19.2 +++ b/flrec/receipt Fri Mar 23 10:45:35 2018 +0200 19.3 @@ -1,4 +1,4 @@ 19.4 -# SliTaz package receipt. 19.5 +# SliTaz package receipt v2. 19.6 19.7 PACKAGE="flrec" 19.8 VERSION="0.13" 19.9 @@ -6,22 +6,19 @@ 19.10 SHORT_DESC="FLTK RECorder is a simple audio hard disk recorder" 19.11 MAINTAINER="pankso@slitaz.org" 19.12 LICENSE="GPL2" 19.13 +WEB_SITE="http://www.matteolucarelli.net/flrec/index_en.htm" 19.14 + 19.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 19.16 -WEB_SITE="http://www.matteolucarelli.net/flrec/index_en.htm" 19.17 WGET_URL="http://www.matteolucarelli.net/flrec/$TARBALL" 19.18 19.19 -DEPENDS="fltk sox" 19.20 -BUILD_DEPENDS="fltk-dev sox-dev" 19.21 +BUILD_DEPENDS="fltk-dev sox-dev xorg-libX11-dev" 19.22 19.23 -# Rules to configure and make the package. 19.24 -compile_rules() 19.25 -{ 19.26 - make CC=${HOST_SYSTEM}-g++ 19.27 +compile_rules() { 19.28 + make CC=$HOST_SYSTEM-g++ && 19.29 + install -Dm755 $src/flrec $install/usr/bin/flrec 19.30 } 19.31 19.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 19.33 -genpkg_rules() 19.34 -{ 19.35 - mkdir -p $fs/usr/bin 19.36 - cp -a ${src}/flrec $fs/usr/bin 19.37 +genpkg_rules() { 19.38 + copy @std 19.39 + DEPENDS="fltk sox" 19.40 }
20.1 --- a/flxine/receipt Fri Mar 23 09:21:17 2018 +0100 20.2 +++ b/flxine/receipt Fri Mar 23 10:45:35 2018 +0200 20.3 @@ -1,4 +1,4 @@ 20.4 -# SliTaz package receipt 20.5 +# SliTaz package receipt v2. 20.6 20.7 PACKAGE="flxine" 20.8 VERSION="0.6.10" 20.9 @@ -6,25 +6,22 @@ 20.10 SHORT_DESC="FLTK Xine frontend" 20.11 MAINTAINER="pankso@slitaz.org" 20.12 LICENSE="MIT" 20.13 +WEB_SITE="http://home.arcor.de/szukw000/english_index.html" 20.14 + 20.15 TARBALL="$PACKAGE-fltk13-source-$VERSION.tgz" 20.16 -WEB_SITE="http://home.arcor.de/szukw000/english_index.html" 20.17 WGET_URL="http://home.arcor.de/szukw000/$TARBALL" 20.18 20.19 -DEPENDS="fltk xine-lib" 20.20 -BUILD_DEPENDS="fltk-dev xine-lib-dev autoconf automake" 20.21 +BUILD_DEPENDS="shared-mime-info fltk-dev xine-lib-dev autoconf automake \ 20.22 +xorg-libX11-dev" 20.23 20.24 -# Rules to configure and make the package. 20.25 -compile_rules() 20.26 -{ 20.27 +compile_rules() { 20.28 #export ac_cv_lib_pthread_pthread_create=yes 20.29 ./bootstrap.sh && 20.30 - ./configure $CONFIGURE_ARGS && 20.31 + ./configure $CONFIGURE_ARGS && 20.32 make && make install 20.33 } 20.34 20.35 -# Rules to gen a SliTaz package suitable for Tazpkg. 20.36 -genpkg_rules() 20.37 -{ 20.38 - mkdir -p $fs/usr 20.39 - cp -a $install/usr/bin $fs/usr 20.40 +genpkg_rules() { 20.41 + copy @std 20.42 + DEPENDS="fltk xine-lib" 20.43 }
21.1 --- a/frozen-bubble/receipt Fri Mar 23 09:21:17 2018 +0100 21.2 +++ b/frozen-bubble/receipt Fri Mar 23 10:45:35 2018 +0200 21.3 @@ -1,4 +1,4 @@ 21.4 -# SliTaz package receipt. 21.5 +# SliTaz package receipt v2. 21.6 21.7 PACKAGE="frozen-bubble" 21.8 VERSION="2.2.0" 21.9 @@ -6,31 +6,26 @@ 21.10 SHORT_DESC="A bubbles game" 21.11 MAINTAINER="slaxemulator@gmail.com" 21.12 LICENSE="GPL2" 21.13 +WEB_SITE="http://www.frozen-bubble.org" 21.14 + 21.15 TARBALL="$PACKAGE-$VERSION.tar.bz2" 21.16 -WEB_SITE="http://www.frozen-bubble.org" 21.17 WGET_URL="$WEB_SITE/data/$TARBALL" 21.18 21.19 -DEPENDS="perl-locale-gettext libsdl-mixer libsdl-pango libsdl-perl" 21.20 BUILD_DEPENDS="perl-locale-gettext gettext glib-dev libsdl-dev libsdl-gfx-dev \ 21.21 libsdl-image-dev libsdl-net-dev freetype-dev libsdl-ttf-dev libsdl-mixer-dev \ 21.22 -libsdl-pango-dev libsmpeg-dev libsdl-perl mesa-dev glibc-locale" 21.23 +libsdl-pango-dev libsmpeg-dev pkg-config libsdl-perl mesa-dev glibc-locale \ 21.24 +perl-dev" 21.25 21.26 -# Rules to configure and make the package. 21.27 -compile_rules() 21.28 -{ 21.29 - cd $src 21.30 - make OPTIMIZE="${CFLAGS}" \ 21.31 - CFLAGS="$(pkg-config glib-2.0 --cflags)" INSTALLDIRS=vendor \ 21.32 - PREFIX=/usr 21.33 +compile_rules() { 21.34 + make \ 21.35 + OPTIMIZE="${CFLAGS}" \ 21.36 + CFLAGS="$(pkg-config glib-2.0 --cflags)" \ 21.37 + INSTALLDIRS=vendor \ 21.38 + PREFIX=/usr && 21.39 make DESTDIR=$DESTDIR PREFIX=/usr install 21.40 } 21.41 21.42 -# Rules to gen a SliTaz package suitable for Tazpkg. 21.43 -genpkg_rules() 21.44 -{ 21.45 - mkdir -p $fs/usr/share/pixmaps 21.46 - cp -a $install/usr/bin $fs/usr 21.47 - cp -a $install/usr/lib $fs/usr 21.48 - cp -a $install/usr/share/frozen-bubble $fs/usr/share 21.49 +genpkg_rules() { 21.50 + copy @std 21.51 + DEPENDS="perl-locale-gettext libsdl-mixer libsdl-pango libsdl-perl" 21.52 } 21.53 -
22.1 --- a/ghex/receipt Fri Mar 23 09:21:17 2018 +0100 22.2 +++ b/ghex/receipt Fri Mar 23 10:45:35 2018 +0200 22.3 @@ -1,48 +1,35 @@ 22.4 -# SliTaz package receipt. 22.5 +# SliTaz package receipt v2. 22.6 22.7 PACKAGE="ghex" 22.8 VERSION="2.24.0" 22.9 CATEGORY="x-window" 22.10 -SHORT_DESC="GHex is a simple binary editor." 22.11 +SHORT_DESC="GHex is a simple binary editor" 22.12 MAINTAINER="samuel_trassare@yahoo.com" 22.13 LICENSE="GPL2" 22.14 WEB_SITE="http://directory.fsf.org/wiki/Ghex" 22.15 + 22.16 TARBALL="$PACKAGE-$VERSION.tar.gz" 22.17 WGET_URL="http://ftp.acc.umu.se/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 22.18 22.19 -DEPENDS="gtk+ libgnomeui libgnomeprintui libgnome-keyring" 22.20 BUILD_DEPENDS="gtk+-dev gnome-doc-utils-dev libgnomeui-dev libbonoboui-dev \ 22.21 libgnome-dev libbonobo-dev libbonoboui-dev libgnome-keyring-dev \ 22.22 libgnomeprintui-dev intltool" 22.23 22.24 -# Rules to configure and make the package. 22.25 -compile_rules() 22.26 -{ 22.27 +compile_rules() { 22.28 export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm" 22.29 - 22.30 + 22.31 # GHex2 cannot display help without Yelp. Removing help references. 22.32 patch -Np1 -i $stuff/ghex2-remove-help.patch 22.33 - 22.34 + 22.35 ./configure \ 22.36 --disable-schemas-install \ 22.37 --disable-scrollkeeper \ 22.38 - $CONFIGURE_ARGS && 22.39 + $CONFIGURE_ARGS && 22.40 make && 22.41 make DESTDIR=$install install 22.42 } 22.43 22.44 -# Rules to gen a SliTaz package suitable for Tazpkg. 22.45 -genpkg_rules() 22.46 -{ 22.47 - mkdir -p $fs/usr/bin \ 22.48 - $fs/usr/lib \ 22.49 - $fs/usr/share 22.50 - 22.51 - cp -a $install/usr/bin/* $fs/usr/bin 22.52 - cp -ar $install/usr/etc $fs/usr 22.53 - cp -a $install/usr/lib/*so* $fs/usr/lib 22.54 - cp -ar $install/usr/share/applications $fs/usr/share 22.55 - cp -ar $install/usr/share/gnome-2.0 $fs/usr/share 22.56 - cp -ar $install/usr/share/icons $fs/usr/share 22.57 - cp -ar $install/usr/share/locale $fs/usr/share 22.58 +genpkg_rules() { 22.59 + copy @std 22.60 + DEPENDS="gtk+ libgnomeui libgnomeprintui libgnome-keyring" 22.61 }
23.1 --- a/gnome-python/receipt Fri Mar 23 09:21:17 2018 +0100 23.2 +++ b/gnome-python/receipt Fri Mar 23 10:45:35 2018 +0200 23.3 @@ -3,20 +3,19 @@ 23.4 PACKAGE="gnome-python" 23.5 VERSION="2.28.1" 23.6 CATEGORY="x-window" 23.7 -SHORT_DESC="Python bindings for GNOME." 23.8 +SHORT_DESC="Python bindings for GNOME" 23.9 MAINTAINER="pankso@slitaz.org" 23.10 LICENSE="LGPL2" 23.11 +WEB_SITE="http://www.gnome.org/" 23.12 + 23.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 23.14 -WEB_SITE="http://www.gnome.org/" 23.15 WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 23.16 23.17 BUILD_DEPENDS="python-dev pygobject-dev pygtk-dev libgnome-dev audiofile \ 23.18 -esound libxml2-dev" 23.19 -SPLIT="gnome-python gnome-python-dev python-gconf" 23.20 +esound libxml2-dev libgcrypt-dev" 23.21 +SPLIT="python-gconf gnome-python gnome-python-dev" 23.22 23.23 -# Rules to configure and make the package. 23.24 -compile_rules() 23.25 -{ 23.26 +compile_rules() { 23.27 ./configure \ 23.28 --libexecdir=/usr/lib/$PACKAGE \ 23.29 --sysconfdir=/etc/gnome \ 23.30 @@ -24,30 +23,19 @@ 23.31 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 +genpkg_rules() { 23.38 case $PACKAGE in 23.39 - gnome-python) 23.40 - DEPENDS="python pygobject pygtk libgnome" 23.41 - mkdir -p $fs/usr/share 23.42 - cp -a $install/usr/share/pygtk $fs/usr/share 23.43 - cp -a $install/usr/lib $fs/usr 23.44 - rm -rf $fs/usr/lib/pkgconfig 23.45 - rm -rf $fs/usr/lib/gnome-vfs-2.0/modules/*a 23.46 - ;; 23.47 - gnome-python-dev) 23.48 - mkdir -p $fs/usr/lib/gnome-vfs-2.0/modules 23.49 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 23.50 - cp -a $install/usr/lib/gnome-vfs-2.0/modules/*.so $fs/usr/lib/gnome-vfs-2.0/modules 23.51 - cp -a $install/usr/include $fs/usr 23.52 - ;; 23.53 - python-gconf) 23.54 - CAT="system-tools|Python bindings for gconf." 23.55 - _PYTHONVER=$(grep ^VERSION= $WOK/python/receipt | cut -d "=" -f2 | sed -e 's/"//g') 23.56 - mkdir -p $fs/usr/lib/python${_PYTHONVER%.*}/site-packages/gtk-2.0 23.57 - cp -a $install/usr/lib/python${_PYTHONVER%.*}/site-packages/gtk-2.0/gconf.so \ 23.58 - $fs/usr/lib/python${_PYTHONVER%.*}/site-packages/gtk-2.0 23.59 - ;; 23.60 + python-gconf) 23.61 + copy gconf.so 23.62 + CAT="system-tools|Python bindings for gconf" 23.63 + ;; 23.64 + gnome-python) 23.65 + copy @std @rm 23.66 + DEPENDS="python pygobject pygtk libgnome" 23.67 + ;; 23.68 + gnome-python-dev) 23.69 + copy @dev 23.70 + DEPENDS="gnome-python pkg-config" 23.71 + ;; 23.72 esac 23.73 }
24.1 --- a/gnome-vfs-monikers/receipt Fri Mar 23 09:21:17 2018 +0100 24.2 +++ b/gnome-vfs-monikers/receipt Fri Mar 23 10:45:35 2018 +0200 24.3 @@ -12,7 +12,7 @@ 24.4 WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL" 24.5 24.6 BUILD_DEPENDS="gnome-vfs-dev libbonobo-dev glib-dev orbit2-dev dbus-glib-dev \ 24.7 -perl-xml-parser libxml2-dev" 24.8 +perl-xml-parser libxml2-dev gnutls-dev libgcrypt-dev" 24.9 SPLIT="gnome-vfs-monikers-dev" 24.10 24.11 compile_rules() { 24.12 @@ -30,22 +30,11 @@ 24.13 genpkg_rules() { 24.14 case $PACKAGE in 24.15 gnome-vfs-monikers) 24.16 - mkdir -p $fs/usr/ 24.17 - cp -a $install/usr/lib $fs/usr 24.18 - 24.19 - # Clean unwated files 24.20 - cd $fs/usr/lib ; find . -name "*.*a" -exec rm -f {} \; 24.21 - 24.22 - # Strip all 24.23 - find . -name "*.so" -exec strip -s {} \; 24.24 + copy @std 24.25 DEPENDS="gnome-vfs libbonobo" 24.26 ;; 24.27 *-dev) 24.28 - mkdir -p $fs/usr 24.29 - cp -a $install/usr/lib $fs/usr 24.30 - 24.31 - # Clean unwated files 24.32 - cd $fs/usr/lib ; find . -name "*.so*" -exec rm -f {} \; 24.33 + copy @dev 24.34 DEPENDS="gnome-vfs-monikers gnome-vfs libbonobo" 24.35 ;; 24.36 esac
25.1 --- a/gnome-vfs/receipt Fri Mar 23 09:21:17 2018 +0100 25.2 +++ b/gnome-vfs/receipt Fri Mar 23 10:45:35 2018 +0200 25.3 @@ -6,62 +6,76 @@ 25.4 SHORT_DESC="The GNOME Virtual File System libraries" 25.5 MAINTAINER="erjo@slitaz.org" 25.6 LICENSE="GPL2" 25.7 +WEB_SITE="https://developer.gnome.org/gnome-vfs/" 25.8 + 25.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 25.10 -WEB_SITE="http://www.gnome.org" 25.11 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 25.12 25.13 BUILD_DEPENDS="gtk+-dev dbus-glib-dev GConf-dev bzip2-dev shared-mime-info \ 25.14 -gnome-mime-data libxml2-dev zlib-dev intltool" 25.15 +gnome-mime-data libxml2-dev zlib-dev intltool gnutls-dev libgcrypt-dev \ 25.16 +libtool gtk-doc automake" 25.17 SPLIT="gnome-vfs gnome-vfs-dev gnome-vfs-i18n" 25.18 25.19 -# Rules to configure and make the package. 25.20 -compile_rules() 25.21 -{ 25.22 - sed -i 's/-DG_DISABLE_DEPRECATED//' */Makefile* 25.23 +compile_rules() { 25.24 + sed -i 's|$(srcdir)/auto-test|auto-test|' test/Makefile.am 25.25 + libtoolize --force 25.26 + gtkdocize 25.27 + aclocal 25.28 + autoconf 25.29 + automake --add-missing 25.30 + CFLAGS="$CFLAGS -fno-strict-aliasing" \ 25.31 ./configure \ 25.32 --prefix=/usr \ 25.33 - --sysconfdir=/etc/gnome \ 25.34 + --sysconfdir=/etc \ 25.35 + --localstatedir=/var \ 25.36 + --disable-static \ 25.37 --libexecdir=/usr/lib/gnome-vfs-2.0 \ 25.38 - --disable-schemas-install \ 25.39 - $CONFIGURE_ARGS && 25.40 - make && make DESTDIR=$DESTDIR install 25.41 + --disable-hal \ 25.42 + --disable-howl \ 25.43 + --disable-openssl \ 25.44 + --enable-gnutls \ 25.45 + && 25.46 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool && 25.47 + make && 25.48 + make \ 25.49 + GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \ 25.50 + DESTDIR=$DESTDIR \ 25.51 + install || return 1 25.52 + 25.53 +# mkdir -p $install/usr/share/gconf/schemas/ 25.54 +# gconf-merge-schema \ 25.55 +# $install/usr/share/gconf/schemas/$PACKAGE.schemas \ 25.56 +# --domain gnome-vfs-2.0 \ 25.57 +# $install/etc/gconf/schemas/*.schemas 25.58 +# rm -f $install/etc/gconf/schemas/*.schemas 25.59 + 25.60 + 25.61 + 25.62 +# sed -i 's/-DG_DISABLE_DEPRECATED//' */Makefile* 25.63 +# ./configure \ 25.64 +# --prefix=/usr \ 25.65 +# --sysconfdir=/etc/gnome \ 25.66 +# --libexecdir=/usr/lib/gnome-vfs-2.0 \ 25.67 +# --disable-schemas-install \ 25.68 +# $CONFIGURE_ARGS && 25.69 +# make && make DESTDIR=$DESTDIR install 25.70 } 25.71 25.72 -# Rules to gen a SliTaz package suitable for Tazpkg. 25.73 -genpkg_rules() 25.74 -{ 25.75 +genpkg_rules() { 25.76 case $PACKAGE in 25.77 - gnome-vfs) 25.78 - DEPENDS="dbus dbus-glib GConf glib glibc-base libffi libxml2 \ 25.79 + gnome-vfs) 25.80 + copy @std 25.81 + DEPENDS="dbus dbus-glib GConf glib glibc-base libffi libxml2 \ 25.82 orbit2 zlib" 25.83 - mkdir -p $fs/usr/share $fs/usr/lib 25.84 - cp -a $install/usr/bin $fs/usr 25.85 - cp -a $install/usr/lib/*.so* $fs/usr/lib 25.86 - cp -a $install/usr/lib/gnome-vfs* $fs/usr/lib 25.87 - cp -a $install/usr/share/dbus* $fs/usr/share 25.88 - cp -a $install/etc /$fs 25.89 - 25.90 - # Clean unwated files 25.91 - cd $fs/usr/lib/gnome-vfs-2.0 ; find . -name "*.*a" -exec rm -f {} \; 25.92 - rm -rf ./include 25.93 - ;; 25.94 - gnome-vfs-dev) 25.95 - DEPENDS="gnome-vfs GConf-dev glib-dev" 25.96 - mkdir -p $fs/usr/lib 25.97 - 25.98 - cp -a $install/usr/include $fs/usr 25.99 - cp -a $install/usr/lib/*.*a $fs/usr/lib 25.100 - cp -a $install/usr/lib/gnome-vfs-2.0 $fs/usr/lib 25.101 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 25.102 - 25.103 - # Clean unwated files 25.104 - cd $fs/usr/lib ; find . -name "*.so*" -exec rm -f {} \; 25.105 - ;; 25.106 - gnome-vfs-i18n) 25.107 - CAT="localization|Language files for the GNOME Virtual File System libraries" 25.108 - DEPENDS="gnome-vfs" 25.109 - mkdir -p $fs/usr/share/locale 25.110 - cp -a $install/usr/share/locale/* $fs/usr/share/locale 25.111 - ;; 25.112 + ;; 25.113 + *-dev) 25.114 + copy @dev 25.115 + DEPENDS="gnome-vfs GConf-dev glib-dev" 25.116 + ;; 25.117 + gnome-vfs-i18n) 25.118 + copy locale/ 25.119 + CAT="localization|language files" 25.120 + DEPENDS="gnome-vfs" 25.121 + ;; 25.122 esac 25.123 }
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/gnome-vfs/stuff/patches/enable-deprecated.patch Fri Mar 23 10:45:35 2018 +0200 26.3 @@ -0,0 +1,57 @@ 26.4 +diff -up gnome-vfs-2.24.4/daemon/Makefile.am.bak gnome-vfs-2.24.4/daemon/Makefile.am 26.5 +--- gnome-vfs-2.24.4/daemon/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 26.6 ++++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-03-27 17:01:25.000000000 +0100 26.7 +@@ -8,7 +8,6 @@ INCLUDES= \ 26.8 + -D_LARGEFILE64_SOURCE \ 26.9 + -D_POSIX_PTHREAD_SEMANTICS \ 26.10 + -D_REENTRANT \ 26.11 +- -DG_DISABLE_DEPRECATED \ 26.12 + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ 26.13 + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ 26.14 + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ 26.15 +diff -up gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak gnome-vfs-2.24.4/libgnomevfs/Makefile.am 26.16 +--- gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 26.17 ++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-03-27 17:01:37.000000000 +0100 26.18 +@@ -19,7 +19,6 @@ INCLUDES = \ 26.19 + -D_LARGEFILE64_SOURCE \ 26.20 + -D_POSIX_PTHREAD_SEMANTICS \ 26.21 + -D_REENTRANT \ 26.22 +- -DG_DISABLE_DEPRECATED \ 26.23 + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ 26.24 + -DGNOME_VFS_BINDIR=\"$(bindir)\" \ 26.25 + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ 26.26 +diff -up gnome-vfs-2.24.4/modules/Makefile.am.bak gnome-vfs-2.24.4/modules/Makefile.am 26.27 +--- gnome-vfs-2.24.4/modules/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 26.28 ++++ gnome-vfs-2.24.4/modules/Makefile.am 2013-03-27 17:01:45.000000000 +0100 26.29 +@@ -18,7 +18,6 @@ INCLUDES = \ 26.30 + -D_POSIX_PTHREAD_SEMANTICS \ 26.31 + -D_REENTRANT \ 26.32 + -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ 26.33 +- -DG_DISABLE_DEPRECATED \ 26.34 + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ 26.35 + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ 26.36 + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ 26.37 +diff -up gnome-vfs-2.24.4/programs/Makefile.am.bak gnome-vfs-2.24.4/programs/Makefile.am 26.38 +--- gnome-vfs-2.24.4/programs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 26.39 ++++ gnome-vfs-2.24.4/programs/Makefile.am 2013-03-27 17:01:56.000000000 +0100 26.40 +@@ -4,8 +4,7 @@ INCLUDES = \ 26.41 + -I$(top_srcdir) \ 26.42 + -I$(top_builddir) \ 26.43 + $(TEST_CFLAGS) \ 26.44 +- $(VFS_CFLAGS) \ 26.45 +- -DG_DISABLE_DEPRECATED 26.46 ++ $(VFS_CFLAGS) 26.47 + 26.48 + libraries = \ 26.49 + $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ 26.50 +diff -up gnome-vfs-2.24.4/test/Makefile.am.bak gnome-vfs-2.24.4/test/Makefile.am 26.51 +--- gnome-vfs-2.24.4/test/Makefile.am.bak 2013-03-27 17:01:11.000000000 +0100 26.52 ++++ gnome-vfs-2.24.4/test/Makefile.am 2013-03-27 17:02:08.000000000 +0100 26.53 +@@ -6,7 +6,6 @@ INCLUDES = \ 26.54 + -I$(top_builddir)/libgnomevfs \ 26.55 + $(TEST_CFLAGS) \ 26.56 + $(VFS_CFLAGS) \ 26.57 +- -DG_DISABLE_DEPRECATED \ 26.58 + -DMODULES_PATH=\"$(libdir)/vfs/modules\" 26.59 + 26.60 + if OS_WIN32
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/gnome-vfs/stuff/patches/gcrypt-config.patch Fri Mar 23 10:45:35 2018 +0200 27.3 @@ -0,0 +1,31 @@ 27.4 +# Allow gnome-vfs-2.24 to build with libgcrypt >= 1.5.0 27.5 +--- gnome-vfs-2.24.4/configure.in 2010-07-01 12:36:09.000000000 -0300 27.6 ++++ gnome-vfs-2.24.4-libgcrypt//configure.in 2011-07-22 15:55:02.296325640 -0300 27.7 +@@ -689,6 +689,16 @@ 27.8 + AM_CONDITIONAL(HAVE_SSL, test x$have_ssl = xtrue) 27.9 + 27.10 + dnl **************************** 27.11 ++dnl LibGCrypt 1.5.0 27.12 ++dnl **************************** 27.13 ++ 27.14 ++AM_PATH_LIBGCRYPT(1.5.0) 27.15 ++ 27.16 ++if test "x${LIBGCRYPT_LIBS}" = "x"; then 27.17 ++ AC_MSG_ERROR([unable to find libgcrypt]) 27.18 ++fi 27.19 ++ 27.20 ++dnl **************************** 27.21 + dnl DNS-SD implementations 27.22 + dnl **************************** 27.23 + AM_CONDITIONAL(HAVE_AVAHI, false) 27.24 +@@ -1045,8 +1055,8 @@ 27.25 + dnl ============================================================================== 27.26 + 27.27 + PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) 27.28 +-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS" 27.29 +-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS" 27.30 ++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS $LIBGCRYPT_CFLAGS" 27.31 ++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS $LIBGCRYPT_LIBS" 27.32 + AC_SUBST(LIBGNOMEVFS_CFLAGS) 27.33 + AC_SUBST(LIBGNOMEVFS_LIBS) 27.34 +
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/gnome-vfs/stuff/patches/gnutls-3.4.0.patch Fri Mar 23 10:45:35 2018 +0200 28.3 @@ -0,0 +1,38 @@ 28.4 +diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 28.5 +--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2010-02-09 14:16:14.000000000 +0200 28.6 ++++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2015-04-14 00:01:51.272451668 +0300 28.7 +@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand 28.8 + #endif 28.9 + } 28.10 + 28.11 +-#ifdef HAVE_GNUTLS 28.12 +-static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0}; 28.13 +-static const int cipher_priority[] = 28.14 +- {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC, 28.15 +- GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0}; 28.16 +-static const int comp_priority[] = 28.17 +- {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0}; 28.18 +-static const int kx_priority[] = 28.19 +- {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0}; 28.20 +-static const int mac_priority[] = 28.21 +- {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0}; 28.22 +- 28.23 +-#endif 28.24 +- 28.25 +- 28.26 + /** 28.27 + * gnome_vfs_ssl_create_from_fd: 28.28 + * @handle_return: pointer to a #GnomeVFSSSL struct, which will 28.29 +@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS 28.30 + gnutls_transport_set_ptr (ssl->private->tlsstate, 28.31 + GINT_TO_POINTER (fd)); 28.32 + 28.33 +- gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority); 28.34 +- gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority); 28.35 +- gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority); 28.36 +- gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority); 28.37 +- gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority); 28.38 ++ gnutls_set_default_priority (ssl->private->tlsstate); 28.39 + 28.40 + gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE, 28.41 + ssl->private->xcred);
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/gnome-vfs/stuff/patches/gnutls-config.patch Fri Mar 23 10:45:35 2018 +0200 29.3 @@ -0,0 +1,25 @@ 29.4 +# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 29.5 +# Use pkg-config in place of gnutls own macro since it's not present anymore. 29.6 +--- a/configure.in 2009-03-07 19:59:53.805507753 +0100 29.7 ++++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 29.8 +@@ -686,14 +686,14 @@ 29.9 + AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) 29.10 + else 29.11 + AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) 29.12 +- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) 29.13 +- have_ssl=true]) 29.14 ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) 29.15 ++ have_ssl=true]) 29.16 + 29.17 + if test "x${LIBGNUTLS_LIBS}" = "x"; then 29.18 +- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) 29.19 +- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) 29.20 +- have_ssl=true], 29.21 +- AC_MSG_ERROR([Unable to find GNUTLS])) 29.22 ++ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) 29.23 ++ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) 29.24 ++ have_ssl=true], 29.25 ++ AC_MSG_ERROR([Unable to find GNUTLS])) 29.26 + fi 29.27 + fi 29.28 + fi
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/gnome-vfs/stuff/patches/series Fri Mar 23 10:45:35 2018 +0200 30.3 @@ -0,0 +1,9 @@ 30.4 +# from https://aur.archlinux.org/packages/gnome-vfs/ 30.5 + 30.6 +#Fix build with new gnutls 30.7 +gnutls-config.patch 30.8 +gnutls-3.4.0.patch 30.9 +#fix build with new libgcrypt >= 1.5.0 30.10 +gcrypt-config.patch 30.11 +# remove -DG_DISABLE_DEPRECATED 30.12 +enable-deprecated.patch
31.1 --- a/gparted/receipt Fri Mar 23 09:21:17 2018 +0100 31.2 +++ b/gparted/receipt Fri Mar 23 10:45:35 2018 +0200 31.3 @@ -26,17 +26,19 @@ 31.4 # Remove keywords from desktop file and apply SliTaz graphical SU method 31.5 sed -i '/^_Keywords=/d; s|@gksuprog@|tazbox su|' gparted.desktop.in.in 31.6 31.7 + fix ld 31.8 ./configure \ 31.9 --disable-scrollkeeper \ 31.10 --disable-doc \ 31.11 $CONFIGURE_ARGS && 31.12 + fix libtool && 31.13 make && make install 31.14 } 31.15 31.16 genpkg_rules() { 31.17 copy gparted gpartedbin 31.18 - DEPENDS="atk atkmm cairo cairomm fontconfig freetype gdk-pixbuf glib \ 31.19 - glibmm gtk+ gtkmm libgiomm libsigc++ pango pangomm parted util-linux-uuid" 31.20 + DEPENDS="atkmm glib glibmm gtk+ gtkmm libsigc++ pangomm parted \ 31.21 + util-linux-uuid" 31.22 SUGGESTED="e2fsprogs dosfstools mtools ntfs-3g ntfsprogs jfsutils xfsprogs \ 31.23 reiserfsprogs reiser4progs btrfs-progs f2fs-tools hfsutils hfsprogs \ 31.24 util-linux-mkfs util-linux-misc lvm2 cryptsetup dmsetup nilfs-utils xfsdump"
32.1 --- a/gparted/stuff/patches/slitaz-pkgs.patch Fri Mar 23 09:21:17 2018 +0100 32.2 +++ b/gparted/stuff/patches/slitaz-pkgs.patch Fri Mar 23 10:45:35 2018 +0200 32.3 @@ -2,7 +2,7 @@ 32.4 32.5 --- a/src/Utils.cc 32.6 +++ b/src/Utils.cc 32.7 -@@ -347,7 +347,7 @@ 32.8 +@@ -354,7 +354,7 @@ 32.9 { 32.10 switch( filesystem ) 32.11 { 32.12 @@ -11,7 +11,7 @@ 32.13 case FS_EXT2 : return "e2fsprogs" ; 32.14 case FS_EXT3 : return "e2fsprogs" ; 32.15 case FS_EXT4 : return "e2fsprogs v1.41+" ; 32.16 -@@ -357,13 +357,13 @@ 32.17 +@@ -364,13 +364,13 @@ 32.18 case FS_HFS : return "hfsutils" ; 32.19 case FS_HFSPLUS : return "hfsprogs" ; 32.20 case FS_JFS : return "jfsutils" ; 32.21 @@ -24,6 +24,6 @@ 32.22 case FS_REISER4 : return "reiser4progs" ; 32.23 - case FS_REISERFS : return "reiserfsprogs / reiserfs-utils" ; 32.24 + case FS_REISERFS : return "reiserfsprogs" ; 32.25 + case FS_UDF : return "udftools"; 32.26 case FS_UFS : return "" ; 32.27 case FS_XFS : return "xfsprogs, xfsdump" ; 32.28 -
33.1 --- a/gxine/receipt Fri Mar 23 09:21:17 2018 +0100 33.2 +++ b/gxine/receipt Fri Mar 23 10:45:35 2018 +0200 33.3 @@ -1,30 +1,25 @@ 33.4 -# SliTaz package receipt. 33.5 +# SliTaz package receipt v2. 33.6 33.7 PACKAGE="gxine" 33.8 VERSION="0.5.905" 33.9 CATEGORY="multimedia" 33.10 -SHORT_DESC="GTK+ Xine media player user interface." 33.11 +SHORT_DESC="GTK+ Xine media player user interface" 33.12 MAINTAINER="jozee@slitaz.org" 33.13 LICENSE="GPL2" 33.14 +WEB_SITE="http://www.xine-project.org" 33.15 + 33.16 TARBALL="$PACKAGE-$VERSION.tar.bz2" 33.17 -WEB_SITE="http://www.xine-project.org" 33.18 WGET_URL="http://switch.dl.sourceforge.net/sourceforge/xine/$TARBALL" 33.19 33.20 -DEPENDS="xine-lib libvorbis gtk+ spidermonkey dbus" 33.21 -BUILD_DEPENDS="spidermonkey-dev xine-lib-dev xorg-dev dbus-dev \ 33.22 -gtk+-dev xorg-libXinerama-dev xorg-libXext-dev xorg-xextproto perl \ 33.23 +BUILD_DEPENDS="shared-mime-info spidermonkey-dev xine-lib-dev xorg-dev \ 33.24 +dbus-dev gtk+-dev xorg-libXinerama-dev xorg-libXext-dev xorg-xextproto perl \ 33.25 xorg-libXv-dev xorg-videoproto xorg-xf86vidmodeproto" 33.26 33.27 -# Rules to configure and make the package. 33.28 - 33.29 -compile_rules() 33.30 -{ 33.31 - cd $src 33.32 - 33.33 +compile_rules() { 33.34 # Fix for glib2 (-lm) 33.35 sed -i "/<glib\//d" src/* 33.36 export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries" 33.37 - 33.38 + 33.39 # Fix for lirc 33.40 #patch -p0 < $stuff/gxine-0.5.907-lirc.patch || return 1 33.41 33.42 @@ -43,18 +38,11 @@ 33.43 --disable-own-playlist-parsers \ 33.44 VENDOR_PKG_VERSION="$VERSION; SliTaz GNU/Linux" \ 33.45 $CONFIGURE_ARGS && 33.46 - make && make DESTDIR=$DESTDIR install 33.47 - sed -i '/^x/d' $install/usr/share/applications/gxine.desktop 33.48 -} 33.49 - 33.50 -# Rules to gen a SliTaz package suitable for Tazpkg. 33.51 -genpkg_rules() 33.52 -{ 33.53 - mkdir -p $fs/usr/share $fs/etc $fs/usr/lib 33.54 - cp -a $install/usr/bin $fs/usr 33.55 - cp -a $install/usr/lib/$PACKAGE $fs/usr/lib 33.56 - cp -a $install/usr/share/$PACKAGE $fs/usr/share 33.57 - cp -a $install/usr/share/pixmaps $fs/usr/share 33.58 - cp -a $install/etc $fs 33.59 + make && make DESTDIR=$DESTDIR install 33.60 + sed -i '/^x/d' $install/usr/share/applications/gxine.desktop 33.61 } 33.62 33.63 +genpkg_rules() { 33.64 + copy @std 33.65 + DEPENDS="xine-lib libvorbis gtk+ spidermonkey dbus" 33.66 +}
34.1 --- a/intel-microcode/receipt Fri Mar 23 09:21:17 2018 +0100 34.2 +++ b/intel-microcode/receipt Fri Mar 23 10:45:35 2018 +0200 34.3 @@ -1,7 +1,7 @@ 34.4 # SliTaz package receipt v2. 34.5 34.6 PACKAGE="intel-microcode" 34.7 -VERSION="20171117" 34.8 +VERSION="20180312" 34.9 CATEGORY="kernel" 34.10 SHORT_DESC="Intel processor microcode update for Linux" 34.11 MAINTAINER="al.bobylev@gmail.com" 34.12 @@ -13,8 +13,8 @@ 34.13 # http://linuxfromscratch.org/blfs/view/svn/postlfs/firmware.html#early-microcode 34.14 34.15 TARBALL="$PACKAGE-$VERSION.tgz" 34.16 -WGET_URL="https://downloadmirror.intel.com/27337/eng/microcode-$VERSION.tgz" 34.17 -TARBALL_MD5="b294245d1f7f6c20f01edba53185f258" 34.18 +WGET_URL="https://downloadmirror.intel.com/27591/eng/microcode-$VERSION.tgz" 34.19 +TARBALL_MD5="be315cd99a7ca392a2f917ceacbe14f2" 34.20 SPLIT="intel-microcode-initrd" 34.21 34.22 compile_rules() {
35.1 --- a/ipxe/receipt Fri Mar 23 09:21:17 2018 +0100 35.2 +++ b/ipxe/receipt Fri Mar 23 10:45:35 2018 +0200 35.3 @@ -30,34 +30,43 @@ 35.4 -e 's|//\(#define.*REBOOT_CMD\)|\1|' config/general.h 35.5 cp $stuff/lkrnprefix.S arch/i386/prefix 35.6 35.7 - make all || return 1 35.8 + # refer to http://ipxe.org/appnote/buildtargets 35.9 + case $ARCH in 35.10 + i?86) platform='bin-i386-pcbios';; 35.11 + x86_64) platform='bin-x86_64-pcbios';; 35.12 + esac 35.13 + 35.14 + make $platform || return 1 35.15 separator 35.16 35.17 - make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \ 35.18 - bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe \ 35.19 - bin/ipxe.kkpxe bin/ipxe.kkkpxe bin/ipxe.nbi \ 35.20 - bin/ipxe.lkrn \ 35.21 + make $platform/undionly.pxe $platform/undionly.kpxe \ 35.22 + $platform/undionly.kkpxe $platform/undionly.kkkpxe \ 35.23 + $platform/ipxe.pxe $platform/ipxe.kpxe \ 35.24 + $platform/ipxe.kkpxe $platform/ipxe.kkkpxe \ 35.25 + $platform/ipxe.nbi $platform/ipxe.lkrn \ 35.26 EMBED=$stuff/ipxe.cmd || return 1 35.27 35.28 - mkdir $install/boot 35.29 - cp -a $src/src/bin/ipxe.lkrn $install/boot/ipxe 35.30 + mkdir -p $install/boot/ 35.31 + cp -a $src/src/$platform/ipxe.lkrn $install/boot/ipxe 35.32 OFS=$((0x156)) 35.33 unix2dos <<EOT | dd bs=1 of=$install/boot/ipxe conv=notrunc \ 35.34 seek=$OFS count=$((0x1F0-$OFS)) 35.35 $SHORT_DESC 35.36 EOT 35.37 + 35.38 + mkdir -p $install/usr/share/boot/ 35.39 + cp -a $src/src/$platform/ipxe.kpxe $install/usr/share/boot/ipxe.pxe 35.40 + cp -a $src/src/$platform/undionly.kpxe $install/usr/share/boot/undi.pxe 35.41 } 35.42 35.43 genpkg_rules() { 35.44 case $PACKAGE in 35.45 ipxe) 35.46 - copy @std 35.47 + copy ipxe 35.48 ;; 35.49 ipxe-pxe) 35.50 + copy *.pxe 35.51 CAT="system-tools|for pxe server" 35.52 - mkdir -p $fs/usr/share/boot 35.53 - cp -a $src/src/bin/ipxe.kpxe $fs/usr/share/boot/ipxe.pxe 35.54 - cp -a $src/src/bin/undionly.kpxe $fs/usr/share/boot/undi.pxe 35.55 ;; 35.56 esac 35.57 }
36.1 --- a/lgi/receipt Fri Mar 23 09:21:17 2018 +0100 36.2 +++ b/lgi/receipt Fri Mar 23 10:45:35 2018 +0200 36.3 @@ -1,4 +1,4 @@ 36.4 -# SliTaz package receipt. 36.5 +# SliTaz package receipt v2. 36.6 36.7 PACKAGE="lgi" 36.8 VERSION="0.7.2" 36.9 @@ -7,26 +7,23 @@ 36.10 MAINTAINER="al.bobylev@gmail.com" 36.11 LICENSE="MIT" 36.12 WEB_SITE="https://github.com/pavouk/lgi" 36.13 + 36.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 36.15 WGET_URL="https://github.com/pavouk/lgi/archive/$VERSION.tar.gz" 36.16 36.17 -DEPENDS="glib gobject-introspection lua" 36.18 BUILD_DEPENDS="gobject-introspection-dev lua-dev" 36.19 # add "cairo-dev gtk+-dev" for `make check` 36.20 36.21 -# Rules to configure and make the package. 36.22 -compile_rules() 36.23 -{ 36.24 +compile_rules() { 36.25 # fix paths 36.26 - sed -i 's|/usr/local|/usr|g;s|5.1|5.2|g;s|51|52|g' \ 36.27 + sed -i 's|/usr/local|/usr|g;s|5.1|5.3|g;s|51|53|g' \ 36.28 $src/lgi/Makefile $src/lgi/core.lua $src/lgi/core.c 36.29 # `make check` after `make` produces error 36.30 make && 36.31 make PREFIX=/usr DESTDIR=$install install 36.32 } 36.33 36.34 -# Rules to gen a SliTaz package suitable for Tazpkg. 36.35 -genpkg_rules() 36.36 -{ 36.37 +genpkg_rules() { 36.38 cp -a $install/* $fs 36.39 + DEPENDS="glib gobject-introspection lua" 36.40 }
37.1 --- a/libbonoboui/receipt Fri Mar 23 09:21:17 2018 +0100 37.2 +++ b/libbonoboui/receipt Fri Mar 23 10:45:35 2018 +0200 37.3 @@ -14,7 +14,7 @@ 37.4 BUILD_DEPENDS="glib-dev gtk+-dev libgnome-dev libgnomecanvas-dev libglade-dev \ 37.5 GConf-dev alsa-lib-dev popt-dev libbonobo-dev util-linux-uuid-dev intltool \ 37.6 dbus-glib-dev audiofile esound libffi xorg-libXinerama-dev xorg-libXrandr-dev \ 37.7 -xorg-libXcursor-dev xorg-libXcomposite-dev xorg-libXdamage-dev" 37.8 +xorg-libXcursor-dev xorg-libXcomposite-dev xorg-libXdamage-dev libgcrypt-dev" 37.9 SPLIT="libbonoboui-dev" 37.10 37.11 compile_rules() { 37.12 @@ -28,28 +28,12 @@ 37.13 genpkg_rules() { 37.14 case $PACKAGE in 37.15 libbonoboui) 37.16 - mkdir -p $fs/usr/lib 37.17 - mkdir -p $fs/usr/share 37.18 - cp -a $install/usr/bin $fs/usr 37.19 - cp -a $install/usr/lib/*.so* $fs/usr/lib 37.20 - cp -a $install/usr/lib/bonobo* $fs/usr/lib 37.21 - cp -a $install/usr/lib/libglade $fs/usr/lib 37.22 - cp -a $install/usr/share/applications $fs/usr/share 37.23 - cp -a $install/usr/share/gnome-2.0 $fs/usr/share 37.24 - 37.25 - # remove archive lib 37.26 - find $fs/usr/lib -name "*.*a" -exec rm -f {} \; 37.27 + copy @std 37.28 DEPENDS="glib gtk+ libgnome libgnomecanvas libglade GConf alsa-lib \ 37.29 popt libbonobo" 37.30 ;; 37.31 *-dev) 37.32 - mkdir -p $fs/usr/lib 37.33 - cp -a $install/usr/include $fs/usr 37.34 - cp -a $install/usr/lib/*.*a $fs/usr/lib 37.35 - cp -a $install/usr/lib/pkgconfig $fs/usr/lib 37.36 - cp -a $install/usr/lib/libglade $fs/usr/lib 37.37 - # remove archive lib 37.38 - find $fs/usr/lib -name *.so* -exec rm -f {} \; 37.39 + copy @dev 37.40 DEPENDS="libbonoboui libgnomecanvas-dev" 37.41 ;; 37.42 esac
38.1 --- a/libcss/receipt Fri Mar 23 09:21:17 2018 +0100 38.2 +++ b/libcss/receipt Fri Mar 23 10:45:35 2018 +0200 38.3 @@ -1,8 +1,8 @@ 38.4 # SliTaz package receipt v2. 38.5 38.6 PACKAGE="libcss" 38.7 -COMMIT="3e58dd9a29a10cd6400031f0b510084ffacc41d0" 38.8 -VERSION="0.6.1-170920" 38.9 +COMMIT="" 38.10 +VERSION="0.7.0" 38.11 CATEGORY="system-tools" 38.12 SHORT_DESC="CSS parser and selection engine" 38.13 MAINTAINER="erjo@slitaz.org" 38.14 @@ -45,4 +45,5 @@ 38.15 DEPENDS="libcss libparserutils-dev libwapcaplet-dev" 38.16 ;; 38.17 esac 38.18 + TAGS="netsurf" 38.19 }
39.1 --- a/libdom/receipt Fri Mar 23 09:21:17 2018 +0100 39.2 +++ b/libdom/receipt Fri Mar 23 10:45:35 2018 +0200 39.3 @@ -1,8 +1,8 @@ 39.4 # SliTaz package receipt v2. 39.5 39.6 PACKAGE="libdom" 39.7 -COMMIT="4e9b50f5b200918088bc6b1136751ea81cd8984b" 39.8 -VERSION="0.3.1-170204" 39.9 +COMMIT="" 39.10 +VERSION="0.3.2" 39.11 CATEGORY="web" 39.12 SHORT_DESC="Implementation of the W3C DOM" 39.13 MAINTAINER="al.bobylev@gmail.com" 39.14 @@ -46,4 +46,5 @@ 39.15 DEPENDS="libdom expat-dev libhubbub-dev" 39.16 ;; 39.17 esac 39.18 + TAGS="netsurf" 39.19 }
40.1 --- a/libgnome/receipt Fri Mar 23 09:21:17 2018 +0100 40.2 +++ b/libgnome/receipt Fri Mar 23 10:45:35 2018 +0200 40.3 @@ -12,7 +12,8 @@ 40.4 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL" 40.5 40.6 BUILD_DEPENDS="libbonobo-dev gnome-vfs-dev esound-dev audiofile-dev \ 40.7 -GConf-dev popt-dev alsa-lib-dev dbus-glib-dev intltool libffi libxml2-dev" 40.8 +GConf-dev popt-dev alsa-lib-dev dbus-glib-dev intltool libffi libxml2-dev \ 40.9 +gnutls-dev libgcrypt-dev" 40.10 SPLIT="libgnome-dev" 40.11 40.12 compile_rules() {
41.1 --- a/libhubbub/receipt Fri Mar 23 09:21:17 2018 +0100 41.2 +++ b/libhubbub/receipt Fri Mar 23 10:45:35 2018 +0200 41.3 @@ -1,8 +1,8 @@ 41.4 # SliTaz package receipt v2. 41.5 41.6 PACKAGE="libhubbub" 41.7 -COMMIT="0eb6188c3a931063f78b017c621b79709746706e" 41.8 -VERSION="0.3.3-170909" 41.9 +COMMIT="" 41.10 +VERSION="0.3.4" 41.11 CATEGORY="system-tools" 41.12 SHORT_DESC="Hubbub is an HTML5 compliant parsing library, written in C" 41.13 MAINTAINER="pankso@slitaz.org" 41.14 @@ -44,4 +44,5 @@ 41.15 PROVIDE="hubbub-dev" 41.16 ;; 41.17 esac 41.18 + TAGS="netsurf" 41.19 }
42.1 --- a/libnsbmp/receipt Fri Mar 23 09:21:17 2018 +0100 42.2 +++ b/libnsbmp/receipt Fri Mar 23 10:45:35 2018 +0200 42.3 @@ -36,4 +36,5 @@ 42.4 libnsbmp) copy @std;; 42.5 *-dev) copy @dev;; 42.6 esac 42.7 + TAGS="netsurf" 42.8 }
43.1 --- a/libnsgif/receipt Fri Mar 23 09:21:17 2018 +0100 43.2 +++ b/libnsgif/receipt Fri Mar 23 10:45:35 2018 +0200 43.3 @@ -2,7 +2,7 @@ 43.4 43.5 PACKAGE="libnsgif" 43.6 COMMIT="" 43.7 -VERSION="0.1.4" 43.8 +VERSION="0.2.0" 43.9 CATEGORY="libs" 43.10 SHORT_DESC="Decoding library for the GIF image file format" 43.11 MAINTAINER="pankso@slitaz.org" 43.12 @@ -38,4 +38,5 @@ 43.13 libnsgif) copy @std;; 43.14 *-dev) copy @dev;; 43.15 esac 43.16 + TAGS="netsurf" 43.17 }
44.1 --- a/libnslayout/receipt Fri Mar 23 09:21:17 2018 +0100 44.2 +++ b/libnslayout/receipt Fri Mar 23 10:45:35 2018 +0200 44.3 @@ -44,4 +44,5 @@ 44.4 libwapcaplet-dev" 44.5 ;; 44.6 esac 44.7 + TAGS="netsurf" 44.8 }
45.1 --- a/libnslog/receipt Fri Mar 23 09:21:17 2018 +0100 45.2 +++ b/libnslog/receipt Fri Mar 23 10:45:35 2018 +0200 45.3 @@ -1,8 +1,8 @@ 45.4 # SliTaz package receipt v2. 45.5 45.6 PACKAGE="libnslog" 45.7 -COMMIT="1940ea405b3ea49eca8e696e0f2938985c9c79ac" 45.8 -VERSION="0-170910" 45.9 +COMMIT="" 45.10 +VERSION="0.1.0" 45.11 CATEGORY="libs" 45.12 SHORT_DESC="NetSurf Parametric Logging Library" 45.13 MAINTAINER="al.bobylev@gmail.com" 45.14 @@ -36,4 +36,5 @@ 45.15 libnslog) copy @std;; 45.16 *-dev) copy @dev;; 45.17 esac 45.18 + TAGS="netsurf" 45.19 }
46.1 --- a/libnspsl/receipt Fri Mar 23 09:21:17 2018 +0100 46.2 +++ b/libnspsl/receipt Fri Mar 23 10:45:35 2018 +0200 46.3 @@ -1,8 +1,8 @@ 46.4 # SliTaz package receipt v2. 46.5 46.6 PACKAGE="libnspsl" 46.7 -COMMIT="9724f92b7d8e54c23ca4849647763002d9019437" 46.8 -VERSION="0.1.0-170528" 46.9 +COMMIT="" 46.10 +VERSION="0.1.2" 46.11 CATEGORY="libs" 46.12 SHORT_DESC="NetSurf public suffix list handling" 46.13 MAINTAINER="al.bobylev@gmail.com" 46.14 @@ -36,4 +36,5 @@ 46.15 libnspsl) copy @std;; 46.16 *-dev) copy @dev;; 46.17 esac 46.18 + TAGS="netsurf" 46.19 }
47.1 --- a/libnsutils/receipt Fri Mar 23 09:21:17 2018 +0100 47.2 +++ b/libnsutils/receipt Fri Mar 23 10:45:35 2018 +0200 47.3 @@ -36,4 +36,5 @@ 47.4 libnsutils) copy @std;; 47.5 *-dev) copy @dev;; 47.6 esac 47.7 + TAGS="netsurf" 47.8 }
48.1 --- a/libparserutils/receipt Fri Mar 23 09:21:17 2018 +0100 48.2 +++ b/libparserutils/receipt Fri Mar 23 10:45:35 2018 +0200 48.3 @@ -39,4 +39,5 @@ 48.4 libparserutils) copy @std;; 48.5 *-dev) copy @dev;; 48.6 esac 48.7 + TAGS="netsurf" 48.8 }
49.1 --- a/libssh/receipt Fri Mar 23 09:21:17 2018 +0100 49.2 +++ b/libssh/receipt Fri Mar 23 10:45:35 2018 +0200 49.3 @@ -7,37 +7,35 @@ 49.4 MAINTAINER="slaxemulator@gmail.com" 49.5 LICENSE="LGPL2.1" 49.6 WEB_SITE="http://www.libssh.org/" 49.7 -TAGS="ssh" 49.8 49.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 49.10 WGET_URL="https://red.libssh.org/attachments/download/218/$TARBALL" 49.11 TARBALL_MD5="d3fc864208bf607ad87cdee836894feb" 49.12 49.13 -BUILD_DEPENDS="cmake zlib-dev openssl-dev" 49.14 +BUILD_DEPENDS="cmake zlib-dev libgcrypt-dev" # or openssl-dev (currently broken) 49.15 SPLIT="libssh-dev" 49.16 49.17 -# Rules to configure and make the package. 49.18 -compile_rules() 49.19 -{ 49.20 +compile_rules() { 49.21 mkdir build 49.22 cd build 49.23 cmake \ 49.24 -DCMAKE_INSTALL_PREFIX=/usr \ 49.25 -DCMAKE_BUILD_TYPE=Release \ 49.26 + -DWITH_GSSAPI=OFF \ 49.27 + -DWITH_GCRYPT=ON \ 49.28 .. && 49.29 make && 49.30 make install 49.31 } 49.32 49.33 -# Rules to gen a SliTaz package suitable for Tazpkg. 49.34 -genpkg_rules() 49.35 -{ 49.36 +genpkg_rules() { 49.37 case $PACKAGE in 49.38 libssh) 49.39 copy @std 49.40 - DEPENDS="openssl zlib" 49.41 + DEPENDS="libgcrypt zlib" # or openssl 49.42 + TAGS="ssh" 49.43 ;; 49.44 - libssh-dev) 49.45 + *-dev) 49.46 copy @dev 49.47 ;; 49.48 esac
50.1 --- a/libsvgtiny/receipt Fri Mar 23 09:21:17 2018 +0100 50.2 +++ b/libsvgtiny/receipt Fri Mar 23 10:45:35 2018 +0200 50.3 @@ -1,8 +1,8 @@ 50.4 # SliTaz package receipt v2. 50.5 50.6 PACKAGE="libsvgtiny" 50.7 -COMMIT="d5060009e934f2715a35601f7e4192702a473216" 50.8 -VERSION="0.1.5-170724" 50.9 +COMMIT="" 50.10 +VERSION="0.1.6" 50.11 CATEGORY="libs" 50.12 SHORT_DESC="SVG Tiny library" 50.13 MAINTAINER="al.bobylev@gmail.com" 50.14 @@ -45,4 +45,5 @@ 50.15 DEPENDS="libsvgtiny libdom-dev" 50.16 ;; 50.17 esac 50.18 + TAGS="netsurf" 50.19 }
51.1 --- a/libt4k_common/receipt Fri Mar 23 09:21:17 2018 +0100 51.2 +++ b/libt4k_common/receipt Fri Mar 23 10:45:35 2018 +0200 51.3 @@ -3,43 +3,33 @@ 51.4 PACKAGE="libt4k_common" 51.5 VERSION="0.1.1" 51.6 CATEGORY="games" 51.7 -SHORT_DESC="Common libraries for tux4kids games." 51.8 +SHORT_DESC="Common libraries for tux4kids games" 51.9 MAINTAINER="samuel_trassare@yahoo.com" 51.10 LICENSE="GPL3" 51.11 WEB_SITE="http://tux4kids.alioth.debian.org" 51.12 -SOURCE="t4k_common" 51.13 -TARBALL="$SOURCE-$VERSION.tar.gz" 51.14 + 51.15 +TARBALL="t4k_common-$VERSION.tar.gz" 51.16 WGET_URL="https://alioth.debian.org/frs/download.php/3540/$TARBALL" 51.17 51.18 BUILD_DEPENDS="libsdl-dev libsdl-image-dev libsdl-mixer-dev libsdl-ttf-dev \ 51.19 -libsdl-net-dev librsvg-dev libsdl-pango-dev libxml2-dev" 51.20 +libsdl-net-dev librsvg-dev libsdl-pango-dev wget libxml2-dev libcroco-dev" 51.21 SPLIT="libt4k_common-dev" 51.22 51.23 -# Rules to configure and make the package. 51.24 -compile_rules() 51.25 -{ 51.26 +compile_rules() { 51.27 ./configure $CONFIGURE_ARGS && 51.28 make && 51.29 make install 51.30 } 51.31 51.32 -# Rules to gen a SliTaz package suitable for Tazpkg. 51.33 -genpkg_rules() 51.34 -{ 51.35 +genpkg_rules() { 51.36 case $PACKAGE in 51.37 - libt4k_common) 51.38 - DEPENDS="libsdl libsdl-image libsdl-mixer libsdl-ttf \ 51.39 + libt4k_common) 51.40 + copy @std 51.41 + DEPENDS="libsdl libsdl-image libsdl-mixer libsdl-ttf \ 51.42 libsdl-net librsvg libsdl-pango" 51.43 - mkdir -p $fs/usr/lib $fs/usr/share 51.44 - cp -a $install/usr/lib/*so* $fs/usr/lib 51.45 - cp -ar $install/usr/share/* $fs/usr/share 51.46 - ;; 51.47 - libt4k_common-dev) 51.48 - mkdir -p $fs/usr/include \ 51.49 - $fs/usr/lib/pkgconfig 51.50 - cp -a $install/usr/include/* $fs/usr/include 51.51 - cp -a $install/usr/lib/*a* $fs/usr/lib 51.52 - cp -a $install/usr/lib/pkgconfig/* $fs/usr/lib/pkgconfig 51.53 - ;; 51.54 + ;; 51.55 + *-dev) 51.56 + copy @dev 51.57 + ;; 51.58 esac 51.59 }
52.1 --- a/libwapcaplet/receipt Fri Mar 23 09:21:17 2018 +0100 52.2 +++ b/libwapcaplet/receipt Fri Mar 23 10:45:35 2018 +0200 52.3 @@ -38,4 +38,5 @@ 52.4 libwapcaplet) copy @std;; 52.5 *-dev) copy @dev;; 52.6 esac 52.7 + TAGS="netsurf" 52.8 }
53.1 --- a/lua/receipt Fri Mar 23 09:21:17 2018 +0100 53.2 +++ b/lua/receipt Fri Mar 23 10:45:35 2018 +0200 53.3 @@ -14,17 +14,19 @@ 53.4 BUILD_DEPENDS="readline-dev" 53.5 SPLIT="liblua lua-dev" 53.6 53.7 -# Rules to configure and make the package. 53.8 -compile_rules() 53.9 -{ 53.10 - sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h && 53.11 +compile_rules() { 53.12 + sed -i '/#define LUA_ROOT/ s:/usr/local/:/usr/:' src/luaconf.h 53.13 53.14 case "$ARCH" in 53.15 arm) 53.16 make CC=${HOST_SYSTEM}-gcc posix 53.17 ;; 53.18 i486) 53.19 - sed -i s"/-O2/-Os -march=$ARCH/" src/Makefile 53.20 + sed -i "s|-O2|-Os -march=$ARCH|" src/Makefile 53.21 + make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux 53.22 + ;; 53.23 + x86_64) 53.24 + sed -i 's|-O2|-Os -march=nocona|' src/Makefile 53.25 make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux 53.26 ;; 53.27 esac && 53.28 @@ -34,13 +36,11 @@ 53.29 INSTALL_DATA="cp -d" \ 53.30 INSTALL_MAN=$DESTDIR/usr/share/man/man1 \ 53.31 TO_LIB="liblua.so liblua.so.${VERSION%.*} liblua.so.$VERSION" \ 53.32 - install && 53.33 + install || return 1 53.34 53.35 - docdir="$install/usr/share/doc/lua-$VERSION" && 53.36 - mkdir -p $docdir && 53.37 - cp -a doc/* $docdir && rm $docdir/*.1 && 53.38 + cook_pick_docs doc/* 53.39 53.40 - mkdir -p $install/usr/lib/pkgconfig && 53.41 + mkdir -p $install/usr/lib/pkgconfig 53.42 cp $stuff/lua.pc $install/usr/lib/pkgconfig 53.43 } 53.44 53.45 @@ -48,9 +48,7 @@ 53.46 readelf -h $install/usr/bin/lua 53.47 } 53.48 53.49 -# Rules to gen a SliTaz package suitable for Tazpkg. 53.50 -genpkg_rules() 53.51 -{ 53.52 +genpkg_rules() { 53.53 case $PACKAGE in 53.54 lua) 53.55 copy bin/
54.1 --- a/mingw32-binutils/receipt Fri Mar 23 09:21:17 2018 +0100 54.2 +++ b/mingw32-binutils/receipt Fri Mar 23 10:45:35 2018 +0200 54.3 @@ -1,19 +1,17 @@ 54.4 -# SliTaz package receipt. 54.5 +# SliTaz package receipt v2. 54.6 54.7 PACKAGE="mingw32-binutils" 54.8 -SOURCE="binutils" 54.9 -VERSION="2.19.1" 54.10 +VERSION="2.28-1" 54.11 CATEGORY="development" 54.12 -SHORT_DESC="MinGW32 binutils." 54.13 +SHORT_DESC="MinGW32 binutils" 54.14 MAINTAINER="rcx@zoominternet.net" 54.15 LICENSE="GPL2" 54.16 -TARBALL="$SOURCE-$VERSION-src.tar.gz" 54.17 WEB_SITE="http://www.mingw.org/" 54.18 + 54.19 +TARBALL="binutils-$VERSION-mingw32-src.tar.xz" 54.20 WGET_URL="$SF_MIRROR/mingw/$TARBALL" 54.21 -TAGS="assembler linker" 54.22 54.23 -DEPENDS="glibc-base zlib" 54.24 -BUILD_DEPENDS="slitaz-toolchain bison flex" 54.25 +BUILD_DEPENDS="slitaz-toolchain bison flex texinfo" 54.26 54.27 # Configuration only needs included if we're in the build/wok environment 54.28 if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then 54.29 @@ -52,4 +50,7 @@ 54.30 54.31 #Create a symlink for --with-sysroot 54.32 ln -s . $fs$MINGW32_ROOT/usr 54.33 + 54.34 + DEPENDS="glibc-base zlib" 54.35 + TAGS="assembler linker" 54.36 }
55.1 --- a/nbs/receipt Fri Mar 23 09:21:17 2018 +0100 55.2 +++ b/nbs/receipt Fri Mar 23 10:45:35 2018 +0200 55.3 @@ -15,10 +15,17 @@ 55.4 SPLIT="nbs-dev" 55.5 55.6 compile_rules() { 55.7 + # respect DESTDIR 55.8 + sed -i.orig 's|/usr/|\$(DESTDIR)/usr/|g' Makefile 55.9 + mkdir -p $install/usr/bin/ 55.10 + 55.11 make && 55.12 make DESTDIR=$DESTDIR install || return 1 55.13 55.14 ln -s libnbs.so.1.0 $install/usr/lib/libnbs.so.1 55.15 + 55.16 + # like --disable static (asterisk don't like this lib) 55.17 + find $install -type f -name '*.a' -delete 55.18 } 55.19 55.20 genpkg_rules() {
56.1 --- a/net-snmp/receipt Fri Mar 23 09:21:17 2018 +0100 56.2 +++ b/net-snmp/receipt Fri Mar 23 10:45:35 2018 +0200 56.3 @@ -11,10 +11,11 @@ 56.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 56.5 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 56.6 56.7 -BUILD_DEPENDS="perl-dev openssl-dev file" 56.8 +BUILD_DEPENDS="perl-dev openssl-dev file automake libtool" 56.9 SPLIT="net-snmp-dev" 56.10 56.11 compile_rules() { 56.12 + autoreconf -i && 56.13 ./configure \ 56.14 --with-default-snmp-version="1" \ 56.15 --with-sys-contact="user@localhost" \
57.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 57.2 +++ b/net-snmp/stuff/patches/fix-openssl-build-errors.patch Fri Mar 23 10:45:35 2018 +0200 57.3 @@ -0,0 +1,171 @@ 57.4 +net-snmp build fails on Debian 9 with OpenSSL 1.1.0 57.5 + 57.6 +With these changes, net-snmp builds with both 57.7 +OpenSSL 1.0.x and 1.1.x. 57.8 + 57.9 +Author: Sharmila Podury <sharmila.podury@brocade.com> 57.10 + 57.11 +--- a/apps/snmpusm.c 57.12 ++++ b/apps/snmpusm.c 57.13 +@@ -125,6 +125,32 @@ char *usmUserPublic_val = NULL 57.14 + int docreateandwait = 0; 57.15 + 57.16 + 57.17 ++#if OPENSSL_VERSION_NUMBER < 0x10100000L 57.18 ++ 57.19 ++#include <string.h> 57.20 ++#include <openssl/engine.h> 57.21 ++ 57.22 ++void DH_get0_pqg(const DH *dh, 57.23 ++ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) 57.24 ++{ 57.25 ++ if (p != NULL) 57.26 ++ *p = dh->p; 57.27 ++ if (q != NULL) 57.28 ++ *q = dh->q; 57.29 ++ if (g != NULL) 57.30 ++ *g = dh->g; 57.31 ++} 57.32 ++ 57.33 ++void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) 57.34 ++{ 57.35 ++ if (pub_key != NULL) 57.36 ++ *pub_key = dh->pub_key; 57.37 ++ if (priv_key != NULL) 57.38 ++ *priv_key = dh->priv_key; 57.39 ++} 57.40 ++ 57.41 ++#endif 57.42 ++ 57.43 + void 57.44 + usage(void) 57.45 + { 57.46 +@@ -190,7 +216,7 @@ get_USM_DH_key(netsnmp_variable_list *va 57.47 + oid *keyoid, size_t keyoid_len) { 57.48 + u_char *dhkeychange; 57.49 + DH *dh; 57.50 +- BIGNUM *other_pub; 57.51 ++ BIGNUM *p, *g, *pub_key, *other_pub; 57.52 + u_char *key; 57.53 + size_t key_len; 57.54 + 57.55 +@@ -205,25 +231,29 @@ get_USM_DH_key(netsnmp_variable_list *va 57.56 + dh = d2i_DHparams(NULL, &cp, dhvar->val_len); 57.57 + } 57.58 + 57.59 +- if (!dh || !dh->g || !dh->p) { 57.60 ++ if (dh) 57.61 ++ DH_get0_pqg(dh, &p, NULL, &g); 57.62 ++ 57.63 ++ if (!dh || !g || !p) { 57.64 + SNMP_FREE(dhkeychange); 57.65 + return SNMPERR_GENERR; 57.66 + } 57.67 + 57.68 +- DH_generate_key(dh); 57.69 +- if (!dh->pub_key) { 57.70 ++ if (!DH_generate_key(dh)) { 57.71 + SNMP_FREE(dhkeychange); 57.72 + return SNMPERR_GENERR; 57.73 + } 57.74 + 57.75 +- if (vars->val_len != (unsigned int)BN_num_bytes(dh->pub_key)) { 57.76 ++ DH_get0_key(dh, &pub_key, NULL); 57.77 ++ 57.78 ++ if (vars->val_len != (unsigned int)BN_num_bytes(pub_key)) { 57.79 + SNMP_FREE(dhkeychange); 57.80 + fprintf(stderr,"incorrect diffie-helman lengths (%lu != %d)\n", 57.81 +- (unsigned long)vars->val_len, BN_num_bytes(dh->pub_key)); 57.82 ++ (unsigned long)vars->val_len, BN_num_bytes(pub_key)); 57.83 + return SNMPERR_GENERR; 57.84 + } 57.85 + 57.86 +- BN_bn2bin(dh->pub_key, dhkeychange + vars->val_len); 57.87 ++ BN_bn2bin(pub_key, dhkeychange + vars->val_len); 57.88 + 57.89 + key_len = DH_size(dh); 57.90 + if (!key_len) { 57.91 +--- a/configure.d/config_os_libs2 57.92 ++++ b/configure.d/config_os_libs2 57.93 +@@ -327,10 +327,16 @@ if test "x$tryopenssl" != "xno" -a "x$tr 57.94 + [[#include <openssl/evp.h>]]) 57.95 + 57.96 + AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create, 57.97 +- AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [], 57.98 ++ AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [1], 57.99 + [Define to 1 if you have the `EVP_MD_CTX_create' function.]) 57.100 +- AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [], 57.101 ++ AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [1], 57.102 + [Define to 1 if you have the `EVP_MD_CTX_destroy' function.])) 57.103 ++ 57.104 ++ AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_new, 57.105 ++ AC_DEFINE([HAVE_EVP_MD_CTX_NEW], [1], 57.106 ++ [Define to 1 if you have the `EVP_MD_CTX_new' function.]) 57.107 ++ AC_DEFINE([HAVE_EVP_MD_CTX_FREE], [1], 57.108 ++ [Define to 1 if you have the `EVP_MD_CTX_free' function.])) 57.109 + fi 57.110 + if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then 57.111 + AC_CHECK_LIB(ssl, DTLSv1_method, 57.112 +--- a/include/net-snmp/net-snmp-config.h.in 57.113 ++++ b/include/net-snmp/net-snmp-config.h.in 57.114 +@@ -164,6 +164,12 @@ 57.115 + /* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */ 57.116 + #undef HAVE_EVP_MD_CTX_DESTROY 57.117 + 57.118 ++/* Define to 1 if you have the `EVP_MD_CTX_free' function. */ 57.119 ++#undef HAVE_EVP_MD_CTX_FREE 57.120 ++ 57.121 ++/* Define to 1 if you have the `EVP_MD_CTX_new' function. */ 57.122 ++#undef HAVE_EVP_MD_CTX_NEW 57.123 ++ 57.124 + /* Define if you have EVP_sha224/256 in openssl */ 57.125 + #undef HAVE_EVP_SHA224 57.126 + 57.127 +--- a/snmplib/keytools.c 57.128 ++++ b/snmplib/keytools.c 57.129 +@@ -176,7 +176,9 @@ generate_Ku(const oid * hashtype, u_int 57.130 + QUITFUN(SNMPERR_GENERR, generate_Ku_quit); 57.131 + } 57.132 + 57.133 +-#ifdef HAVE_EVP_MD_CTX_CREATE 57.134 ++#ifdef HAVE_EVP_MD_CTX_NEW 57.135 ++ ctx = EVP_MD_CTX_new(); 57.136 ++#elif HAVE_EVP_MD_CTX_CREATE 57.137 + ctx = EVP_MD_CTX_create(); 57.138 + #else 57.139 + ctx = malloc(sizeof(*ctx)); 57.140 +@@ -278,7 +280,9 @@ generate_Ku(const oid * hashtype, u_int 57.141 + memset(buf, 0, sizeof(buf)); 57.142 + #ifdef NETSNMP_USE_OPENSSL 57.143 + if (ctx) { 57.144 +-#ifdef HAVE_EVP_MD_CTX_DESTROY 57.145 ++#ifdef HAVE_EVP_MD_CTX_FREE 57.146 ++ EVP_MD_CTX_free(ctx); 57.147 ++#elif HAVE_EVP_MD_CTX_DESTROY 57.148 + EVP_MD_CTX_destroy(ctx); 57.149 + #else 57.150 + EVP_MD_CTX_cleanup(ctx); 57.151 +--- a/snmplib/scapi.c 57.152 ++++ b/snmplib/scapi.c 57.153 +@@ -627,7 +627,9 @@ sc_hash(const oid * hashtype, size_t has 57.154 + return SNMPERR_GENERR; 57.155 + 57.156 + /** initialize the pointer */ 57.157 +-#ifdef HAVE_EVP_MD_CTX_CREATE 57.158 ++#ifdef HAVE_EVP_MD_CTX_NEW 57.159 ++ cptr = EVP_MD_CTX_new(); 57.160 ++#elif HAVE_EVP_MD_CTX_CREATE 57.161 + cptr = EVP_MD_CTX_create(); 57.162 + #else 57.163 + cptr = malloc(sizeof(*cptr)); 57.164 +@@ -648,7 +650,9 @@ sc_hash(const oid * hashtype, size_t has 57.165 + /** do the final pass */ 57.166 + EVP_DigestFinal(cptr, MAC, &tmp_len); 57.167 + *MAC_len = tmp_len; 57.168 +-#ifdef HAVE_EVP_MD_CTX_DESTROY 57.169 ++#ifdef HAVE_EVP_MD_CTX_FREE 57.170 ++ EVP_MD_CTX_free(cptr); 57.171 ++#elif HAVE_EVP_MD_CTX_DESTROY 57.172 + EVP_MD_CTX_destroy(cptr); 57.173 + #else 57.174 + #if !defined(OLD_DES)
58.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 58.2 +++ b/net-snmp/stuff/patches/net-snmp-5.7.3-perl-5.24.patch Fri Mar 23 10:45:35 2018 +0200 58.3 @@ -0,0 +1,2599 @@ 58.4 +From 477b4307ef12ddce3b6a9205e0bdddbfb2e0e9b6 Mon Sep 17 00:00:00 2001 58.5 +From: Bart Van Assche <bvanassche@acm.org> 58.6 +Date: Sat, 20 Feb 2016 18:58:18 -0800 58.7 +Subject: [PATCH] Remove U64 typedef 58.8 + 58.9 +The U64 typedef conflicts with a typedef in a Perl header file. Hence 58.10 +remove the U64 typedef from the Net-SNMP header files. This patch does 58.11 +not modify the Net-SNMP ABI. 58.12 +--- 58.13 + agent/mibgroup/if-mib/ifXTable/ifXTable.c | 16 +- 58.14 + agent/mibgroup/if-mib/ifXTable/ifXTable.h | 48 +- 58.15 + .../mibgroup/if-mib/ifXTable/ifXTable_interface.c | 32 +- 58.16 + .../ip-mib/data_access/systemstats_common.c | 2 +- 58.17 + .../ipIfStatsTable/ipIfStatsTable_data_get.c | 28 +- 58.18 + .../ipIfStatsTable/ipIfStatsTable_data_get.h | 28 +- 58.19 + .../ipIfStatsTable/ipIfStatsTable_interface.c | 56 +- 58.20 + .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.c | 28 +- 58.21 + .../ip-mib/ipSystemStatsTable/ipSystemStatsTable.h | 921 ++------------------- 58.22 + .../ipSystemStatsTable_interface.c | 56 +- 58.23 + include/net-snmp/data_access/ipstats.h | 42 +- 58.24 + include/net-snmp/library/int64.h | 34 +- 58.25 + snmplib/int64.c | 38 +- 58.26 + snmplib/read_config.c | 6 +- 58.27 + testing/fulltests/unit-tests/T015int64_clib.c | 10 +- 58.28 + 15 files changed, 274 insertions(+), 1071 deletions(-) 58.29 + 58.30 +diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.c b/agent/mibgroup/if-mib/ifXTable/ifXTable.c 58.31 +index bb3e736..0c952ba 100644 58.32 +--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.c 58.33 ++++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.c 58.34 +@@ -722,7 +722,7 @@ The total number of octets received on the interface, 58.35 + */ 58.36 + int 58.37 + ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.38 +- U64 * ifHCInOctets_val_ptr) 58.39 ++ struct counter64 *ifHCInOctets_val_ptr) 58.40 + { 58.41 + /** we should have a non-NULL pointer */ 58.42 + netsnmp_assert(NULL != ifHCInOctets_val_ptr); 58.43 +@@ -779,7 +779,7 @@ The number of packets, delivered by this sub-layer to a 58.44 + */ 58.45 + int 58.46 + ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.47 +- U64 * ifHCInUcastPkts_val_ptr) 58.48 ++ struct counter64 *ifHCInUcastPkts_val_ptr) 58.49 + { 58.50 + /** we should have a non-NULL pointer */ 58.51 + netsnmp_assert(NULL != ifHCInUcastPkts_val_ptr); 58.52 +@@ -838,7 +838,7 @@ The number of packets, delivered by this sub-layer to a 58.53 + */ 58.54 + int 58.55 + ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.56 +- U64 * ifHCInMulticastPkts_val_ptr) 58.57 ++ struct counter64 *ifHCInMulticastPkts_val_ptr) 58.58 + { 58.59 + /** we should have a non-NULL pointer */ 58.60 + netsnmp_assert(NULL != ifHCInMulticastPkts_val_ptr); 58.61 +@@ -897,7 +897,7 @@ The number of packets, delivered by this sub-layer to a 58.62 + */ 58.63 + int 58.64 + ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.65 +- U64 * ifHCInBroadcastPkts_val_ptr) 58.66 ++ struct counter64 *ifHCInBroadcastPkts_val_ptr) 58.67 + { 58.68 + /** we should have a non-NULL pointer */ 58.69 + netsnmp_assert(NULL != ifHCInBroadcastPkts_val_ptr); 58.70 +@@ -955,7 +955,7 @@ The total number of octets transmitted out of the 58.71 + */ 58.72 + int 58.73 + ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.74 +- U64 * ifHCOutOctets_val_ptr) 58.75 ++ struct counter64 *ifHCOutOctets_val_ptr) 58.76 + { 58.77 + /** we should have a non-NULL pointer */ 58.78 + netsnmp_assert(NULL != ifHCOutOctets_val_ptr); 58.79 +@@ -1013,7 +1013,7 @@ The total number of packets that higher-level protocols 58.80 + */ 58.81 + int 58.82 + ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.83 +- U64 * ifHCOutUcastPkts_val_ptr) 58.84 ++ struct counter64 *ifHCOutUcastPkts_val_ptr) 58.85 + { 58.86 + /** we should have a non-NULL pointer */ 58.87 + netsnmp_assert(NULL != ifHCOutUcastPkts_val_ptr); 58.88 +@@ -1074,7 +1074,7 @@ The total number of packets that higher-level protocols 58.89 + */ 58.90 + int 58.91 + ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.92 +- U64 * ifHCOutMulticastPkts_val_ptr) 58.93 ++ struct counter64 *ifHCOutMulticastPkts_val_ptr) 58.94 + { 58.95 + /** we should have a non-NULL pointer */ 58.96 + netsnmp_assert(NULL != ifHCOutMulticastPkts_val_ptr); 58.97 +@@ -1134,7 +1134,7 @@ The total number of packets that higher-level protocols 58.98 + */ 58.99 + int 58.100 + ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.101 +- U64 * ifHCOutBroadcastPkts_val_ptr) 58.102 ++ struct counter64 *ifHCOutBroadcastPkts_val_ptr) 58.103 + { 58.104 + /** we should have a non-NULL pointer */ 58.105 + netsnmp_assert(NULL != ifHCOutBroadcastPkts_val_ptr); 58.106 +diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable.h b/agent/mibgroup/if-mib/ifXTable/ifXTable.h 58.107 +index ba22f97..925af13 100644 58.108 +--- a/agent/mibgroup/if-mib/ifXTable/ifXTable.h 58.109 ++++ b/agent/mibgroup/if-mib/ifXTable/ifXTable.h 58.110 +@@ -143,28 +143,28 @@ config_require(if-mib/ifXTable/ifXTable_data_access) 58.111 + u_long * 58.112 + ifOutBroadcastPkts_val_ptr); 58.113 + int ifHCInOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.114 +- U64 * ifHCInOctets_val_ptr); 58.115 ++ struct counter64 *ifHCInOctets_val_ptr); 58.116 + int ifHCInUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.117 +- U64 * ifHCInUcastPkts_val_ptr); 58.118 ++ struct counter64 *ifHCInUcastPkts_val_ptr); 58.119 + int ifHCInMulticastPkts_get(ifXTable_rowreq_ctx * 58.120 + rowreq_ctx, 58.121 +- U64 * 58.122 ++ struct counter64 * 58.123 + ifHCInMulticastPkts_val_ptr); 58.124 + int ifHCInBroadcastPkts_get(ifXTable_rowreq_ctx * 58.125 + rowreq_ctx, 58.126 +- U64 * 58.127 ++ struct counter64 * 58.128 + ifHCInBroadcastPkts_val_ptr); 58.129 + int ifHCOutOctets_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.130 +- U64 * ifHCOutOctets_val_ptr); 58.131 ++ struct counter64 *ifHCOutOctets_val_ptr); 58.132 + int ifHCOutUcastPkts_get(ifXTable_rowreq_ctx * rowreq_ctx, 58.133 +- U64 * ifHCOutUcastPkts_val_ptr); 58.134 ++ struct counter64 *ifHCOutUcastPkts_val_ptr); 58.135 + int ifHCOutMulticastPkts_get(ifXTable_rowreq_ctx * 58.136 + rowreq_ctx, 58.137 +- U64 * 58.138 ++ struct counter64 * 58.139 + ifHCOutMulticastPkts_val_ptr); 58.140 + int ifHCOutBroadcastPkts_get(ifXTable_rowreq_ctx * 58.141 + rowreq_ctx, 58.142 +- U64 * 58.143 ++ struct counter64 * 58.144 + ifHCOutBroadcastPkts_val_ptr); 58.145 + int ifLinkUpDownTrapEnable_get(ifXTable_rowreq_ctx * 58.146 + rowreq_ctx, 58.147 +@@ -284,86 +284,86 @@ config_require(if-mib/ifXTable/ifXTable_data_access) 58.148 + 58.149 + int ifHCInOctets_check_value(ifXTable_rowreq_ctx * 58.150 + rowreq_ctx, 58.151 +- U64 ifHCInOctets_val); 58.152 ++ struct counter64 ifHCInOctets_val); 58.153 + int ifHCInOctets_undo_setup(ifXTable_rowreq_ctx * 58.154 + rowreq_ctx); 58.155 + int ifHCInOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, 58.156 +- U64 ifHCInOctets_val); 58.157 ++ struct counter64 ifHCInOctets_val); 58.158 + int ifHCInOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); 58.159 + 58.160 + int ifHCInUcastPkts_check_value(ifXTable_rowreq_ctx * 58.161 + rowreq_ctx, 58.162 +- U64 ifHCInUcastPkts_val); 58.163 ++ struct counter64 ifHCInUcastPkts_val); 58.164 + int ifHCInUcastPkts_undo_setup(ifXTable_rowreq_ctx * 58.165 + rowreq_ctx); 58.166 + int ifHCInUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, 58.167 +- U64 ifHCInUcastPkts_val); 58.168 ++ struct counter64 ifHCInUcastPkts_val); 58.169 + int ifHCInUcastPkts_undo(ifXTable_rowreq_ctx * rowreq_ctx); 58.170 + 58.171 + int ifHCInMulticastPkts_check_value(ifXTable_rowreq_ctx * 58.172 + rowreq_ctx, 58.173 +- U64 58.174 ++ struct counter64 58.175 + ifHCInMulticastPkts_val); 58.176 + int ifHCInMulticastPkts_undo_setup(ifXTable_rowreq_ctx * 58.177 + rowreq_ctx); 58.178 + int ifHCInMulticastPkts_set(ifXTable_rowreq_ctx * 58.179 + rowreq_ctx, 58.180 +- U64 ifHCInMulticastPkts_val); 58.181 ++ struct counter64 ifHCInMulticastPkts_val); 58.182 + int ifHCInMulticastPkts_undo(ifXTable_rowreq_ctx * 58.183 + rowreq_ctx); 58.184 + 58.185 + int ifHCInBroadcastPkts_check_value(ifXTable_rowreq_ctx * 58.186 + rowreq_ctx, 58.187 +- U64 58.188 ++ struct counter64 58.189 + ifHCInBroadcastPkts_val); 58.190 + int ifHCInBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * 58.191 + rowreq_ctx); 58.192 + int ifHCInBroadcastPkts_set(ifXTable_rowreq_ctx * 58.193 + rowreq_ctx, 58.194 +- U64 ifHCInBroadcastPkts_val); 58.195 ++ struct counter64 ifHCInBroadcastPkts_val); 58.196 + int ifHCInBroadcastPkts_undo(ifXTable_rowreq_ctx * 58.197 + rowreq_ctx); 58.198 + 58.199 + int ifHCOutOctets_check_value(ifXTable_rowreq_ctx * 58.200 + rowreq_ctx, 58.201 +- U64 ifHCOutOctets_val); 58.202 ++ struct counter64 ifHCOutOctets_val); 58.203 + int ifHCOutOctets_undo_setup(ifXTable_rowreq_ctx * 58.204 + rowreq_ctx); 58.205 + int ifHCOutOctets_set(ifXTable_rowreq_ctx * rowreq_ctx, 58.206 +- U64 ifHCOutOctets_val); 58.207 ++ struct counter64 ifHCOutOctets_val); 58.208 + int ifHCOutOctets_undo(ifXTable_rowreq_ctx * rowreq_ctx); 58.209 + 58.210 + int ifHCOutUcastPkts_check_value(ifXTable_rowreq_ctx * 58.211 + rowreq_ctx, 58.212 +- U64 ifHCOutUcastPkts_val); 58.213 ++ struct counter64 ifHCOutUcastPkts_val); 58.214 + int ifHCOutUcastPkts_undo_setup(ifXTable_rowreq_ctx * 58.215 + rowreq_ctx); 58.216 + int ifHCOutUcastPkts_set(ifXTable_rowreq_ctx * rowreq_ctx, 58.217 +- U64 ifHCOutUcastPkts_val); 58.218 ++ struct counter64 ifHCOutUcastPkts_val); 58.219 + int ifHCOutUcastPkts_undo(ifXTable_rowreq_ctx * 58.220 + rowreq_ctx); 58.221 + 58.222 + int ifHCOutMulticastPkts_check_value(ifXTable_rowreq_ctx * 58.223 + rowreq_ctx, 58.224 +- U64 58.225 ++ struct counter64 58.226 + ifHCOutMulticastPkts_val); 58.227 + int ifHCOutMulticastPkts_undo_setup(ifXTable_rowreq_ctx * 58.228 + rowreq_ctx); 58.229 + int ifHCOutMulticastPkts_set(ifXTable_rowreq_ctx * 58.230 + rowreq_ctx, 58.231 +- U64 ifHCOutMulticastPkts_val); 58.232 ++ struct counter64 ifHCOutMulticastPkts_val); 58.233 + int ifHCOutMulticastPkts_undo(ifXTable_rowreq_ctx * 58.234 + rowreq_ctx); 58.235 + 58.236 + int ifHCOutBroadcastPkts_check_value(ifXTable_rowreq_ctx * 58.237 + rowreq_ctx, 58.238 +- U64 58.239 ++ struct counter64 58.240 + ifHCOutBroadcastPkts_val); 58.241 + int ifHCOutBroadcastPkts_undo_setup(ifXTable_rowreq_ctx * 58.242 + rowreq_ctx); 58.243 + int ifHCOutBroadcastPkts_set(ifXTable_rowreq_ctx * 58.244 + rowreq_ctx, 58.245 +- U64 ifHCOutBroadcastPkts_val); 58.246 ++ struct counter64 ifHCOutBroadcastPkts_val); 58.247 + int ifHCOutBroadcastPkts_undo(ifXTable_rowreq_ctx * 58.248 + rowreq_ctx); 58.249 + 58.250 +diff --git a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c 58.251 +index 23b50d0..e561842 100644 58.252 +--- a/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c 58.253 ++++ b/agent/mibgroup/if-mib/ifXTable/ifXTable_interface.c 58.254 +@@ -729,72 +729,72 @@ _ifXTable_get_column(ifXTable_rowreq_ctx * rowreq_ctx, 58.255 + * ifHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.256 + */ 58.257 + case COLUMN_IFHCINOCTETS: 58.258 +- var->val_len = sizeof(U64); 58.259 ++ var->val_len = sizeof(struct counter64); 58.260 + var->type = ASN_COUNTER64; 58.261 +- rc = ifHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); 58.262 ++ rc = ifHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.263 + break; 58.264 + 58.265 + /* 58.266 + * ifHCInUcastPkts(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.267 + */ 58.268 + case COLUMN_IFHCINUCASTPKTS: 58.269 +- var->val_len = sizeof(U64); 58.270 ++ var->val_len = sizeof(struct counter64); 58.271 + var->type = ASN_COUNTER64; 58.272 +- rc = ifHCInUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 58.273 ++ rc = ifHCInUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.274 + break; 58.275 + 58.276 + /* 58.277 + * ifHCInMulticastPkts(8)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.278 + */ 58.279 + case COLUMN_IFHCINMULTICASTPKTS: 58.280 +- var->val_len = sizeof(U64); 58.281 ++ var->val_len = sizeof(struct counter64); 58.282 + var->type = ASN_COUNTER64; 58.283 +- rc = ifHCInMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); 58.284 ++ rc = ifHCInMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.285 + break; 58.286 + 58.287 + /* 58.288 + * ifHCInBroadcastPkts(9)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.289 + */ 58.290 + case COLUMN_IFHCINBROADCASTPKTS: 58.291 +- var->val_len = sizeof(U64); 58.292 ++ var->val_len = sizeof(struct counter64); 58.293 + var->type = ASN_COUNTER64; 58.294 +- rc = ifHCInBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 58.295 ++ rc = ifHCInBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.296 + break; 58.297 + 58.298 + /* 58.299 + * ifHCOutOctets(10)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.300 + */ 58.301 + case COLUMN_IFHCOUTOCTETS: 58.302 +- var->val_len = sizeof(U64); 58.303 ++ var->val_len = sizeof(struct counter64); 58.304 + var->type = ASN_COUNTER64; 58.305 +- rc = ifHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); 58.306 ++ rc = ifHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.307 + break; 58.308 + 58.309 + /* 58.310 + * ifHCOutUcastPkts(11)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.311 + */ 58.312 + case COLUMN_IFHCOUTUCASTPKTS: 58.313 +- var->val_len = sizeof(U64); 58.314 ++ var->val_len = sizeof(struct counter64); 58.315 + var->type = ASN_COUNTER64; 58.316 +- rc = ifHCOutUcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 58.317 ++ rc = ifHCOutUcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.318 + break; 58.319 + 58.320 + /* 58.321 + * ifHCOutMulticastPkts(12)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.322 + */ 58.323 + case COLUMN_IFHCOUTMULTICASTPKTS: 58.324 +- var->val_len = sizeof(U64); 58.325 ++ var->val_len = sizeof(struct counter64); 58.326 + var->type = ASN_COUNTER64; 58.327 +- rc = ifHCOutMulticastPkts_get(rowreq_ctx, (U64 *) var->val.string); 58.328 ++ rc = ifHCOutMulticastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.329 + break; 58.330 + 58.331 + /* 58.332 + * ifHCOutBroadcastPkts(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.333 + */ 58.334 + case COLUMN_IFHCOUTBROADCASTPKTS: 58.335 +- var->val_len = sizeof(U64); 58.336 ++ var->val_len = sizeof(struct counter64); 58.337 + var->type = ASN_COUNTER64; 58.338 +- rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (U64 *) var->val.string); 58.339 ++ rc = ifHCOutBroadcastPkts_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.340 + break; 58.341 + 58.342 + /* 58.343 +diff --git a/agent/mibgroup/ip-mib/data_access/systemstats_common.c b/agent/mibgroup/ip-mib/data_access/systemstats_common.c 58.344 +index 29109bd..7434b3a 100644 58.345 +--- a/agent/mibgroup/ip-mib/data_access/systemstats_common.c 58.346 ++++ b/agent/mibgroup/ip-mib/data_access/systemstats_common.c 58.347 +@@ -264,7 +264,7 @@ _calculate_entries(netsnmp_systemstats_entry * entry) 58.348 + && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTFRAGCREATES] 58.349 + && entry->stats.columnAvail[IPSYSTEMSTATSTABLE_HCOUTDISCARDS]) { 58.350 + 58.351 +- U64 tmp, tmp2, tmp3; 58.352 ++ struct counter64 tmp, tmp2, tmp3; 58.353 + tmp = entry->stats.HCOutRequests; 58.354 + u64Incr(&tmp, &entry->stats.HCOutForwDatagrams); 58.355 + u64Incr(&tmp, &entry->stats.HCOutFragCreates); 58.356 +diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c 58.357 +index db673dc..fec36b2 100644 58.358 +--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c 58.359 ++++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.c 58.360 +@@ -270,7 +270,7 @@ The total number of input IP datagrams received, including 58.361 + */ 58.362 + int 58.363 + ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.364 +- U64 * ipIfStatsHCInReceives_val_ptr) 58.365 ++ struct counter64 *ipIfStatsHCInReceives_val_ptr) 58.366 + { 58.367 + /** we should have a non-NULL pointer */ 58.368 + netsnmp_assert(NULL != ipIfStatsHCInReceives_val_ptr); 58.369 +@@ -395,7 +395,7 @@ The total number of octets received in input IP datagrams, 58.370 + */ 58.371 + int 58.372 + ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.373 +- U64 * ipIfStatsHCInOctets_val_ptr) 58.374 ++ struct counter64 *ipIfStatsHCInOctets_val_ptr) 58.375 + { 58.376 + /** we should have a non-NULL pointer */ 58.377 + netsnmp_assert(NULL != ipIfStatsHCInOctets_val_ptr); 58.378 +@@ -862,7 +862,7 @@ The number of input datagrams for which this entity was not 58.379 + */ 58.380 + int 58.381 + ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.382 +- U64 * ipIfStatsHCInForwDatagrams_val_ptr) 58.383 ++ struct counter64 *ipIfStatsHCInForwDatagrams_val_ptr) 58.384 + { 58.385 + /** we should have a non-NULL pointer */ 58.386 + netsnmp_assert(NULL != ipIfStatsHCInForwDatagrams_val_ptr); 58.387 +@@ -1267,7 +1267,7 @@ The total number of datagrams successfully delivered to IP 58.388 + */ 58.389 + int 58.390 + ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.391 +- U64 * ipIfStatsHCInDelivers_val_ptr) 58.392 ++ struct counter64 *ipIfStatsHCInDelivers_val_ptr) 58.393 + { 58.394 + /** we should have a non-NULL pointer */ 58.395 + netsnmp_assert(NULL != ipIfStatsHCInDelivers_val_ptr); 58.396 +@@ -1396,7 +1396,7 @@ The total number of IP datagrams that local IP user- 58.397 + */ 58.398 + int 58.399 + ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.400 +- U64 * ipIfStatsHCOutRequests_val_ptr) 58.401 ++ struct counter64 *ipIfStatsHCOutRequests_val_ptr) 58.402 + { 58.403 + /** we should have a non-NULL pointer */ 58.404 + netsnmp_assert(NULL != ipIfStatsHCOutRequests_val_ptr); 58.405 +@@ -1532,7 +1532,7 @@ The number of datagrams for which this entity was not their 58.406 + */ 58.407 + int 58.408 + ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.409 +- U64 * ipIfStatsHCOutForwDatagrams_val_ptr) 58.410 ++ struct counter64 *ipIfStatsHCOutForwDatagrams_val_ptr) 58.411 + { 58.412 + /** we should have a non-NULL pointer */ 58.413 + netsnmp_assert(NULL != ipIfStatsHCOutForwDatagrams_val_ptr); 58.414 +@@ -1999,7 +1999,7 @@ The total number of IP datagrams that this entity supplied 58.415 + */ 58.416 + int 58.417 + ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.418 +- U64 * ipIfStatsHCOutTransmits_val_ptr) 58.419 ++ struct counter64 *ipIfStatsHCOutTransmits_val_ptr) 58.420 + { 58.421 + /** we should have a non-NULL pointer */ 58.422 + netsnmp_assert(NULL != ipIfStatsHCOutTransmits_val_ptr); 58.423 +@@ -2123,7 +2123,7 @@ The total number of octets in IP datagrams delivered to the 58.424 + */ 58.425 + int 58.426 + ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.427 +- U64 * ipIfStatsHCOutOctets_val_ptr) 58.428 ++ struct counter64 *ipIfStatsHCOutOctets_val_ptr) 58.429 + { 58.430 + /** we should have a non-NULL pointer */ 58.431 + netsnmp_assert(NULL != ipIfStatsHCOutOctets_val_ptr); 58.432 +@@ -2245,7 +2245,7 @@ The number of IP multicast datagrams received. This object 58.433 + */ 58.434 + int 58.435 + ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.436 +- U64 * ipIfStatsHCInMcastPkts_val_ptr) 58.437 ++ struct counter64 *ipIfStatsHCInMcastPkts_val_ptr) 58.438 + { 58.439 + /** we should have a non-NULL pointer */ 58.440 + netsnmp_assert(NULL != ipIfStatsHCInMcastPkts_val_ptr); 58.441 +@@ -2372,7 +2372,7 @@ The total number of octets received in IP multicast 58.442 + */ 58.443 + int 58.444 + ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.445 +- U64 * ipIfStatsHCInMcastOctets_val_ptr) 58.446 ++ struct counter64 *ipIfStatsHCInMcastOctets_val_ptr) 58.447 + { 58.448 + /** we should have a non-NULL pointer */ 58.449 + netsnmp_assert(NULL != ipIfStatsHCInMcastOctets_val_ptr); 58.450 +@@ -2497,7 +2497,7 @@ The number of IP multicast datagrams transmitted. This 58.451 + */ 58.452 + int 58.453 + ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.454 +- U64 * ipIfStatsHCOutMcastPkts_val_ptr) 58.455 ++ struct counter64 *ipIfStatsHCOutMcastPkts_val_ptr) 58.456 + { 58.457 + /** we should have a non-NULL pointer */ 58.458 + netsnmp_assert(NULL != ipIfStatsHCOutMcastPkts_val_ptr); 58.459 +@@ -2621,7 +2621,7 @@ The total number of octets transmitted in IP multicast 58.460 + */ 58.461 + int 58.462 + ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.463 +- U64 * ipIfStatsHCOutMcastOctets_val_ptr) 58.464 ++ struct counter64 *ipIfStatsHCOutMcastOctets_val_ptr) 58.465 + { 58.466 + /** we should have a non-NULL pointer */ 58.467 + netsnmp_assert(NULL != ipIfStatsHCOutMcastOctets_val_ptr); 58.468 +@@ -2743,7 +2743,7 @@ The number of IP broadcast datagrams received. This object 58.469 + */ 58.470 + int 58.471 + ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.472 +- U64 * ipIfStatsHCInBcastPkts_val_ptr) 58.473 ++ struct counter64 *ipIfStatsHCInBcastPkts_val_ptr) 58.474 + { 58.475 + /** we should have a non-NULL pointer */ 58.476 + netsnmp_assert(NULL != ipIfStatsHCInBcastPkts_val_ptr); 58.477 +@@ -2865,7 +2865,7 @@ The number of IP broadcast datagrams transmitted. This 58.478 + */ 58.479 + int 58.480 + ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.481 +- U64 * ipIfStatsHCOutBcastPkts_val_ptr) 58.482 ++ struct counter64 *ipIfStatsHCOutBcastPkts_val_ptr) 58.483 + { 58.484 + /** we should have a non-NULL pointer */ 58.485 + netsnmp_assert(NULL != ipIfStatsHCOutBcastPkts_val_ptr); 58.486 +diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h 58.487 +index 0cc7e47..ad5d8a0 100644 58.488 +--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h 58.489 ++++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_data_get.h 58.490 +@@ -50,7 +50,7 @@ extern "C" { 58.491 + ipIfStatsInReceives_val_ptr); 58.492 + int ipIfStatsHCInReceives_get(ipIfStatsTable_rowreq_ctx * 58.493 + rowreq_ctx, 58.494 +- U64 * 58.495 ++ struct counter64 * 58.496 + ipIfStatsHCInReceives_val_ptr); 58.497 + int ipIfStatsInOctets_get(ipIfStatsTable_rowreq_ctx * 58.498 + rowreq_ctx, 58.499 +@@ -58,7 +58,7 @@ extern "C" { 58.500 + ipIfStatsInOctets_val_ptr); 58.501 + int ipIfStatsHCInOctets_get(ipIfStatsTable_rowreq_ctx * 58.502 + rowreq_ctx, 58.503 +- U64 * 58.504 ++ struct counter64 * 58.505 + ipIfStatsHCInOctets_val_ptr); 58.506 + int ipIfStatsInHdrErrors_get(ipIfStatsTable_rowreq_ctx * 58.507 + rowreq_ctx, 58.508 +@@ -87,7 +87,7 @@ extern "C" { 58.509 + int 58.510 + ipIfStatsHCInForwDatagrams_get(ipIfStatsTable_rowreq_ctx * 58.511 + rowreq_ctx, 58.512 +- U64 * 58.513 ++ struct counter64 * 58.514 + ipIfStatsHCInForwDatagrams_val_ptr); 58.515 + int ipIfStatsReasmReqds_get(ipIfStatsTable_rowreq_ctx * 58.516 + rowreq_ctx, 58.517 +@@ -111,7 +111,7 @@ extern "C" { 58.518 + ipIfStatsInDelivers_val_ptr); 58.519 + int ipIfStatsHCInDelivers_get(ipIfStatsTable_rowreq_ctx * 58.520 + rowreq_ctx, 58.521 +- U64 * 58.522 ++ struct counter64 * 58.523 + ipIfStatsHCInDelivers_val_ptr); 58.524 + int ipIfStatsOutRequests_get(ipIfStatsTable_rowreq_ctx * 58.525 + rowreq_ctx, 58.526 +@@ -119,7 +119,7 @@ extern "C" { 58.527 + ipIfStatsOutRequests_val_ptr); 58.528 + int ipIfStatsHCOutRequests_get(ipIfStatsTable_rowreq_ctx * 58.529 + rowreq_ctx, 58.530 +- U64 * 58.531 ++ struct counter64 * 58.532 + ipIfStatsHCOutRequests_val_ptr); 58.533 + int ipIfStatsOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx 58.534 + * rowreq_ctx, 58.535 +@@ -128,7 +128,7 @@ extern "C" { 58.536 + int 58.537 + ipIfStatsHCOutForwDatagrams_get(ipIfStatsTable_rowreq_ctx * 58.538 + rowreq_ctx, 58.539 +- U64 * 58.540 ++ struct counter64 * 58.541 + ipIfStatsHCOutForwDatagrams_val_ptr); 58.542 + int ipIfStatsOutDiscards_get(ipIfStatsTable_rowreq_ctx * 58.543 + rowreq_ctx, 58.544 +@@ -156,7 +156,7 @@ extern "C" { 58.545 + ipIfStatsOutTransmits_val_ptr); 58.546 + int ipIfStatsHCOutTransmits_get(ipIfStatsTable_rowreq_ctx * 58.547 + rowreq_ctx, 58.548 +- U64 * 58.549 ++ struct counter64 * 58.550 + ipIfStatsHCOutTransmits_val_ptr); 58.551 + int ipIfStatsOutOctets_get(ipIfStatsTable_rowreq_ctx * 58.552 + rowreq_ctx, 58.553 +@@ -164,7 +164,7 @@ extern "C" { 58.554 + ipIfStatsOutOctets_val_ptr); 58.555 + int ipIfStatsHCOutOctets_get(ipIfStatsTable_rowreq_ctx * 58.556 + rowreq_ctx, 58.557 +- U64 * 58.558 ++ struct counter64 * 58.559 + ipIfStatsHCOutOctets_val_ptr); 58.560 + int ipIfStatsInMcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.561 + rowreq_ctx, 58.562 +@@ -172,7 +172,7 @@ extern "C" { 58.563 + ipIfStatsInMcastPkts_val_ptr); 58.564 + int ipIfStatsHCInMcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.565 + rowreq_ctx, 58.566 +- U64 * 58.567 ++ struct counter64 * 58.568 + ipIfStatsHCInMcastPkts_val_ptr); 58.569 + int ipIfStatsInMcastOctets_get(ipIfStatsTable_rowreq_ctx * 58.570 + rowreq_ctx, 58.571 +@@ -180,7 +180,7 @@ extern "C" { 58.572 + ipIfStatsInMcastOctets_val_ptr); 58.573 + int ipIfStatsHCInMcastOctets_get(ipIfStatsTable_rowreq_ctx 58.574 + * rowreq_ctx, 58.575 +- U64 * 58.576 ++ struct counter64 * 58.577 + ipIfStatsHCInMcastOctets_val_ptr); 58.578 + int ipIfStatsOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.579 + rowreq_ctx, 58.580 +@@ -188,7 +188,7 @@ extern "C" { 58.581 + ipIfStatsOutMcastPkts_val_ptr); 58.582 + int ipIfStatsHCOutMcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.583 + rowreq_ctx, 58.584 +- U64 * 58.585 ++ struct counter64 * 58.586 + ipIfStatsHCOutMcastPkts_val_ptr); 58.587 + int ipIfStatsOutMcastOctets_get(ipIfStatsTable_rowreq_ctx * 58.588 + rowreq_ctx, 58.589 +@@ -196,7 +196,7 @@ extern "C" { 58.590 + ipIfStatsOutMcastOctets_val_ptr); 58.591 + int ipIfStatsHCOutMcastOctets_get(ipIfStatsTable_rowreq_ctx 58.592 + * rowreq_ctx, 58.593 +- U64 * 58.594 ++ struct counter64 * 58.595 + ipIfStatsHCOutMcastOctets_val_ptr); 58.596 + int ipIfStatsInBcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.597 + rowreq_ctx, 58.598 +@@ -204,7 +204,7 @@ extern "C" { 58.599 + ipIfStatsInBcastPkts_val_ptr); 58.600 + int ipIfStatsHCInBcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.601 + rowreq_ctx, 58.602 +- U64 * 58.603 ++ struct counter64 * 58.604 + ipIfStatsHCInBcastPkts_val_ptr); 58.605 + int ipIfStatsOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.606 + rowreq_ctx, 58.607 +@@ -212,7 +212,7 @@ extern "C" { 58.608 + ipIfStatsOutBcastPkts_val_ptr); 58.609 + int ipIfStatsHCOutBcastPkts_get(ipIfStatsTable_rowreq_ctx * 58.610 + rowreq_ctx, 58.611 +- U64 * 58.612 ++ struct counter64 * 58.613 + ipIfStatsHCOutBcastPkts_val_ptr); 58.614 + int 58.615 + ipIfStatsDiscontinuityTime_get(ipIfStatsTable_rowreq_ctx * 58.616 +diff --git a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c 58.617 +index 559d1c1..4955a8b 100644 58.618 +--- a/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c 58.619 ++++ b/agent/mibgroup/ip-mib/ipIfStatsTable/ipIfStatsTable_interface.c 58.620 +@@ -722,10 +722,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.621 + * ipIfStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.622 + */ 58.623 + case COLUMN_IPIFSTATSHCINRECEIVES: 58.624 +- var->val_len = sizeof(U64); 58.625 ++ var->val_len = sizeof(struct counter64); 58.626 + var->type = ASN_COUNTER64; 58.627 + rc = ipIfStatsHCInReceives_get(rowreq_ctx, 58.628 +- (U64 *) var->val.string); 58.629 ++ (struct counter64 *) var->val.string); 58.630 + break; 58.631 + 58.632 + /* 58.633 +@@ -741,9 +741,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.634 + * ipIfStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.635 + */ 58.636 + case COLUMN_IPIFSTATSHCINOCTETS: 58.637 +- var->val_len = sizeof(U64); 58.638 ++ var->val_len = sizeof(struct counter64); 58.639 + var->type = ASN_COUNTER64; 58.640 +- rc = ipIfStatsHCInOctets_get(rowreq_ctx, (U64 *) var->val.string); 58.641 ++ rc = ipIfStatsHCInOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.642 + break; 58.643 + 58.644 + /* 58.645 +@@ -810,10 +810,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.646 + * ipIfStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.647 + */ 58.648 + case COLUMN_IPIFSTATSHCINFORWDATAGRAMS: 58.649 +- var->val_len = sizeof(U64); 58.650 ++ var->val_len = sizeof(struct counter64); 58.651 + var->type = ASN_COUNTER64; 58.652 + rc = ipIfStatsHCInForwDatagrams_get(rowreq_ctx, 58.653 +- (U64 *) var->val.string); 58.654 ++ (struct counter64 *) var->val.string); 58.655 + break; 58.656 + 58.657 + /* 58.658 +@@ -869,10 +869,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.659 + * ipIfStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.660 + */ 58.661 + case COLUMN_IPIFSTATSHCINDELIVERS: 58.662 +- var->val_len = sizeof(U64); 58.663 ++ var->val_len = sizeof(struct counter64); 58.664 + var->type = ASN_COUNTER64; 58.665 + rc = ipIfStatsHCInDelivers_get(rowreq_ctx, 58.666 +- (U64 *) var->val.string); 58.667 ++ (struct counter64 *) var->val.string); 58.668 + break; 58.669 + 58.670 + /* 58.671 +@@ -889,10 +889,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.672 + * ipIfStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.673 + */ 58.674 + case COLUMN_IPIFSTATSHCOUTREQUESTS: 58.675 +- var->val_len = sizeof(U64); 58.676 ++ var->val_len = sizeof(struct counter64); 58.677 + var->type = ASN_COUNTER64; 58.678 + rc = ipIfStatsHCOutRequests_get(rowreq_ctx, 58.679 +- (U64 *) var->val.string); 58.680 ++ (struct counter64 *) var->val.string); 58.681 + break; 58.682 + 58.683 + /* 58.684 +@@ -909,10 +909,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.685 + * ipIfStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.686 + */ 58.687 + case COLUMN_IPIFSTATSHCOUTFORWDATAGRAMS: 58.688 +- var->val_len = sizeof(U64); 58.689 ++ var->val_len = sizeof(struct counter64); 58.690 + var->type = ASN_COUNTER64; 58.691 + rc = ipIfStatsHCOutForwDatagrams_get(rowreq_ctx, 58.692 +- (U64 *) var->val.string); 58.693 ++ (struct counter64 *) var->val.string); 58.694 + break; 58.695 + 58.696 + /* 58.697 +@@ -979,10 +979,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.698 + * ipIfStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.699 + */ 58.700 + case COLUMN_IPIFSTATSHCOUTTRANSMITS: 58.701 +- var->val_len = sizeof(U64); 58.702 ++ var->val_len = sizeof(struct counter64); 58.703 + var->type = ASN_COUNTER64; 58.704 + rc = ipIfStatsHCOutTransmits_get(rowreq_ctx, 58.705 +- (U64 *) var->val.string); 58.706 ++ (struct counter64 *) var->val.string); 58.707 + break; 58.708 + 58.709 + /* 58.710 +@@ -999,9 +999,9 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.711 + * ipIfStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.712 + */ 58.713 + case COLUMN_IPIFSTATSHCOUTOCTETS: 58.714 +- var->val_len = sizeof(U64); 58.715 ++ var->val_len = sizeof(struct counter64); 58.716 + var->type = ASN_COUNTER64; 58.717 +- rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (U64 *) var->val.string); 58.718 ++ rc = ipIfStatsHCOutOctets_get(rowreq_ctx, (struct counter64 *) var->val.string); 58.719 + break; 58.720 + 58.721 + /* 58.722 +@@ -1018,10 +1018,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.723 + * ipIfStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.724 + */ 58.725 + case COLUMN_IPIFSTATSHCINMCASTPKTS: 58.726 +- var->val_len = sizeof(U64); 58.727 ++ var->val_len = sizeof(struct counter64); 58.728 + var->type = ASN_COUNTER64; 58.729 + rc = ipIfStatsHCInMcastPkts_get(rowreq_ctx, 58.730 +- (U64 *) var->val.string); 58.731 ++ (struct counter64 *) var->val.string); 58.732 + break; 58.733 + 58.734 + /* 58.735 +@@ -1038,10 +1038,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.736 + * ipIfStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.737 + */ 58.738 + case COLUMN_IPIFSTATSHCINMCASTOCTETS: 58.739 +- var->val_len = sizeof(U64); 58.740 ++ var->val_len = sizeof(struct counter64); 58.741 + var->type = ASN_COUNTER64; 58.742 + rc = ipIfStatsHCInMcastOctets_get(rowreq_ctx, 58.743 +- (U64 *) var->val.string); 58.744 ++ (struct counter64 *) var->val.string); 58.745 + break; 58.746 + 58.747 + /* 58.748 +@@ -1058,10 +1058,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.749 + * ipIfStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.750 + */ 58.751 + case COLUMN_IPIFSTATSHCOUTMCASTPKTS: 58.752 +- var->val_len = sizeof(U64); 58.753 ++ var->val_len = sizeof(struct counter64); 58.754 + var->type = ASN_COUNTER64; 58.755 + rc = ipIfStatsHCOutMcastPkts_get(rowreq_ctx, 58.756 +- (U64 *) var->val.string); 58.757 ++ (struct counter64 *) var->val.string); 58.758 + break; 58.759 + 58.760 + /* 58.761 +@@ -1078,10 +1078,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.762 + * ipIfStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.763 + */ 58.764 + case COLUMN_IPIFSTATSHCOUTMCASTOCTETS: 58.765 +- var->val_len = sizeof(U64); 58.766 ++ var->val_len = sizeof(struct counter64); 58.767 + var->type = ASN_COUNTER64; 58.768 + rc = ipIfStatsHCOutMcastOctets_get(rowreq_ctx, 58.769 +- (U64 *) var->val.string); 58.770 ++ (struct counter64 *) var->val.string); 58.771 + break; 58.772 + 58.773 + /* 58.774 +@@ -1098,10 +1098,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.775 + * ipIfStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.776 + */ 58.777 + case COLUMN_IPIFSTATSHCINBCASTPKTS: 58.778 +- var->val_len = sizeof(U64); 58.779 ++ var->val_len = sizeof(struct counter64); 58.780 + var->type = ASN_COUNTER64; 58.781 + rc = ipIfStatsHCInBcastPkts_get(rowreq_ctx, 58.782 +- (U64 *) var->val.string); 58.783 ++ (struct counter64 *) var->val.string); 58.784 + break; 58.785 + 58.786 + /* 58.787 +@@ -1118,10 +1118,10 @@ _ipIfStatsTable_get_column(ipIfStatsTable_rowreq_ctx * rowreq_ctx, 58.788 + * ipIfStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.789 + */ 58.790 + case COLUMN_IPIFSTATSHCOUTBCASTPKTS: 58.791 +- var->val_len = sizeof(U64); 58.792 ++ var->val_len = sizeof(struct counter64); 58.793 + var->type = ASN_COUNTER64; 58.794 + rc = ipIfStatsHCOutBcastPkts_get(rowreq_ctx, 58.795 +- (U64 *) var->val.string); 58.796 ++ (struct counter64 *) var->val.string); 58.797 + break; 58.798 + 58.799 + /* 58.800 +diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c 58.801 +index 10587e2..5a9323f 100644 58.802 +--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c 58.803 ++++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.c 58.804 +@@ -452,7 +452,7 @@ The total number of input IP datagrams received, including 58.805 + */ 58.806 + int 58.807 + ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.808 +- U64 * ipSystemStatsHCInReceives_val_ptr) 58.809 ++ struct counter64 *ipSystemStatsHCInReceives_val_ptr) 58.810 + { 58.811 + /** we should have a non-NULL pointer */ 58.812 + netsnmp_assert(NULL != ipSystemStatsHCInReceives_val_ptr); 58.813 +@@ -579,7 +579,7 @@ The total number of octets received in input IP datagrams, 58.814 + */ 58.815 + int 58.816 + ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.817 +- U64 * ipSystemStatsHCInOctets_val_ptr) 58.818 ++ struct counter64 *ipSystemStatsHCInOctets_val_ptr) 58.819 + { 58.820 + /** we should have a non-NULL pointer */ 58.821 + netsnmp_assert(NULL != ipSystemStatsHCInOctets_val_ptr); 58.822 +@@ -1058,7 +1058,7 @@ The number of input datagrams for which this entity was not 58.823 + int 58.824 + ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.825 + rowreq_ctx, 58.826 +- U64 * 58.827 ++ struct counter64 * 58.828 + ipSystemStatsHCInForwDatagrams_val_ptr) 58.829 + { 58.830 + /** we should have a non-NULL pointer */ 58.831 +@@ -1474,7 +1474,7 @@ The total number of datagrams successfully delivered to IP 58.832 + */ 58.833 + int 58.834 + ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.835 +- U64 * ipSystemStatsHCInDelivers_val_ptr) 58.836 ++ struct counter64 *ipSystemStatsHCInDelivers_val_ptr) 58.837 + { 58.838 + /** we should have a non-NULL pointer */ 58.839 + netsnmp_assert(NULL != ipSystemStatsHCInDelivers_val_ptr); 58.840 +@@ -1602,7 +1602,7 @@ The total number of IP datagrams which local IP user- 58.841 + */ 58.842 + int 58.843 + ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.844 +- U64 * ipSystemStatsHCOutRequests_val_ptr) 58.845 ++ struct counter64 *ipSystemStatsHCOutRequests_val_ptr) 58.846 + { 58.847 + /** we should have a non-NULL pointer */ 58.848 + netsnmp_assert(NULL != ipSystemStatsHCOutRequests_val_ptr); 58.849 +@@ -1809,7 +1809,7 @@ The number of datagrams for which this entity was not their 58.850 + int 58.851 + ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.852 + rowreq_ctx, 58.853 +- U64 * 58.854 ++ struct counter64 * 58.855 + ipSystemStatsHCOutForwDatagrams_val_ptr) 58.856 + { 58.857 + /** we should have a non-NULL pointer */ 58.858 +@@ -2288,7 +2288,7 @@ The total number of IP datagrams that this entity supplied 58.859 + */ 58.860 + int 58.861 + ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.862 +- U64 * ipSystemStatsHCOutTransmits_val_ptr) 58.863 ++ struct counter64 *ipSystemStatsHCOutTransmits_val_ptr) 58.864 + { 58.865 + /** we should have a non-NULL pointer */ 58.866 + netsnmp_assert(NULL != ipSystemStatsHCOutTransmits_val_ptr); 58.867 +@@ -2415,7 +2415,7 @@ The total number of octets in IP datagrams delivered to the 58.868 + */ 58.869 + int 58.870 + ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.871 +- U64 * ipSystemStatsHCOutOctets_val_ptr) 58.872 ++ struct counter64 *ipSystemStatsHCOutOctets_val_ptr) 58.873 + { 58.874 + /** we should have a non-NULL pointer */ 58.875 + netsnmp_assert(NULL != ipSystemStatsHCOutOctets_val_ptr); 58.876 +@@ -2539,7 +2539,7 @@ The number of IP multicast datagrams received. This object 58.877 + */ 58.878 + int 58.879 + ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.880 +- U64 * ipSystemStatsHCInMcastPkts_val_ptr) 58.881 ++ struct counter64 *ipSystemStatsHCInMcastPkts_val_ptr) 58.882 + { 58.883 + /** we should have a non-NULL pointer */ 58.884 + netsnmp_assert(NULL != ipSystemStatsHCInMcastPkts_val_ptr); 58.885 +@@ -2665,7 +2665,7 @@ The total number of octets received in IP multicast 58.886 + int 58.887 + ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.888 + rowreq_ctx, 58.889 +- U64 * 58.890 ++ struct counter64 * 58.891 + ipSystemStatsHCInMcastOctets_val_ptr) 58.892 + { 58.893 + /** we should have a non-NULL pointer */ 58.894 +@@ -2790,7 +2790,7 @@ The number of IP multicast datagrams transmitted. This 58.895 + */ 58.896 + int 58.897 + ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.898 +- U64 * ipSystemStatsHCOutMcastPkts_val_ptr) 58.899 ++ struct counter64 *ipSystemStatsHCOutMcastPkts_val_ptr) 58.900 + { 58.901 + /** we should have a non-NULL pointer */ 58.902 + netsnmp_assert(NULL != ipSystemStatsHCOutMcastPkts_val_ptr); 58.903 +@@ -2921,7 +2921,7 @@ The total number of octets transmitted in IP multicast 58.904 + int 58.905 + ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.906 + rowreq_ctx, 58.907 +- U64 * 58.908 ++ struct counter64 * 58.909 + ipSystemStatsHCOutMcastOctets_val_ptr) 58.910 + { 58.911 + /** we should have a non-NULL pointer */ 58.912 +@@ -3046,7 +3046,7 @@ The number of IP broadcast datagrams received. This object 58.913 + */ 58.914 + int 58.915 + ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.916 +- U64 * ipSystemStatsHCInBcastPkts_val_ptr) 58.917 ++ struct counter64 *ipSystemStatsHCInBcastPkts_val_ptr) 58.918 + { 58.919 + /** we should have a non-NULL pointer */ 58.920 + netsnmp_assert(NULL != ipSystemStatsHCInBcastPkts_val_ptr); 58.921 +@@ -3170,7 +3170,7 @@ The number of IP broadcast datagrams transmitted. This 58.922 + */ 58.923 + int 58.924 + ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.925 +- U64 * ipSystemStatsHCOutBcastPkts_val_ptr) 58.926 ++ struct counter64 *ipSystemStatsHCOutBcastPkts_val_ptr) 58.927 + { 58.928 + /** we should have a non-NULL pointer */ 58.929 + netsnmp_assert(NULL != ipSystemStatsHCOutBcastPkts_val_ptr); 58.930 +diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h 58.931 +index ca1e1f3..5c3823e 100644 58.932 +--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h 58.933 ++++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable.h 58.934 +@@ -144,93 +144,22 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) 58.935 + ********************************************************************* 58.936 + * function prototypes 58.937 + */ 58.938 +- int 58.939 +- 58.940 +- 58.941 +- 58.942 +- 58.943 +- 58.944 +- 58.945 +- 58.946 +- 58.947 +- 58.948 +- 58.949 +- 58.950 +- 58.951 +- 58.952 +- 58.953 +- 58.954 +- ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * 58.955 ++ int ipSystemStatsTable_pre_request(ipSystemStatsTable_registration * 58.956 + user_context); 58.957 +- int 58.958 +- 58.959 +- 58.960 +- 58.961 +- 58.962 +- 58.963 +- 58.964 +- 58.965 +- 58.966 +- 58.967 +- 58.968 +- 58.969 +- 58.970 +- 58.971 +- 58.972 +- 58.973 +- ipSystemStatsTable_post_request(ipSystemStatsTable_registration * 58.974 ++ int ipSystemStatsTable_post_request(ipSystemStatsTable_registration * 58.975 + user_context, int rc); 58.976 + 58.977 +- int 58.978 +- 58.979 +- 58.980 +- 58.981 +- 58.982 +- 58.983 +- 58.984 +- 58.985 +- 58.986 +- 58.987 +- 58.988 +- 58.989 +- 58.990 +- 58.991 +- 58.992 +- 58.993 +- ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * 58.994 ++ int ipSystemStatsTable_rowreq_ctx_init(ipSystemStatsTable_rowreq_ctx * 58.995 + rowreq_ctx, 58.996 + void *user_init_ctx); 58.997 + void 58.998 +- 58.999 +- 58.1000 +- 58.1001 +- 58.1002 +- 58.1003 +- 58.1004 +- 58.1005 +- 58.1006 +- 58.1007 +- 58.1008 +- 58.1009 +- 58.1010 +- 58.1011 +- 58.1012 +- 58.1013 + ipSystemStatsTable_rowreq_ctx_cleanup(ipSystemStatsTable_rowreq_ctx 58.1014 + * rowreq_ctx); 58.1015 + 58.1016 + ipSystemStatsTable_data *ipSystemStatsTable_allocate_data(void); 58.1017 + void ipSystemStatsTable_release_data(ipSystemStatsTable_data 58.1018 + * data); 58.1019 +- 58.1020 +- 58.1021 +- 58.1022 +- 58.1023 +- 58.1024 +- 58.1025 +- 58.1026 +- 58.1027 +- ipSystemStatsTable_rowreq_ctx 58.1028 ++ ipSystemStatsTable_rowreq_ctx 58.1029 + * ipSystemStatsTable_row_find_by_mib_index 58.1030 + (ipSystemStatsTable_mib_index * mib_idx); 58.1031 + 58.1032 +@@ -265,226 +194,50 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) 58.1033 + * indexes 58.1034 + */ 58.1035 + 58.1036 +- int 58.1037 +- 58.1038 +- 58.1039 +- 58.1040 +- 58.1041 +- 58.1042 +- 58.1043 +- 58.1044 +- 58.1045 +- 58.1046 +- 58.1047 +- 58.1048 +- 58.1049 +- 58.1050 +- 58.1051 +- 58.1052 +- ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * 58.1053 ++ int ipSystemStatsInReceives_get(ipSystemStatsTable_rowreq_ctx * 58.1054 + rowreq_ctx, 58.1055 + u_long * 58.1056 + ipSystemStatsInReceives_val_ptr); 58.1057 +- int 58.1058 +- 58.1059 +- 58.1060 +- 58.1061 +- 58.1062 +- 58.1063 +- 58.1064 +- 58.1065 +- 58.1066 +- 58.1067 +- 58.1068 +- 58.1069 +- 58.1070 +- 58.1071 +- 58.1072 +- 58.1073 +- ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * 58.1074 ++ int ipSystemStatsHCInReceives_get(ipSystemStatsTable_rowreq_ctx * 58.1075 + rowreq_ctx, 58.1076 +- U64 * 58.1077 ++ struct counter64 * 58.1078 + ipSystemStatsHCInReceives_val_ptr); 58.1079 + int ipSystemStatsInOctets_get(ipSystemStatsTable_rowreq_ctx 58.1080 + * rowreq_ctx, 58.1081 + u_long * 58.1082 + ipSystemStatsInOctets_val_ptr); 58.1083 +- int 58.1084 +- 58.1085 +- 58.1086 +- 58.1087 +- 58.1088 +- 58.1089 +- 58.1090 +- 58.1091 +- 58.1092 +- 58.1093 +- 58.1094 +- 58.1095 +- 58.1096 +- 58.1097 +- 58.1098 +- 58.1099 +- ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1100 ++ int ipSystemStatsHCInOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1101 + rowreq_ctx, 58.1102 +- U64 * ipSystemStatsHCInOctets_val_ptr); 58.1103 +- int 58.1104 +- 58.1105 +- 58.1106 +- 58.1107 +- 58.1108 +- 58.1109 +- 58.1110 +- 58.1111 +- 58.1112 +- 58.1113 +- 58.1114 +- 58.1115 +- 58.1116 +- 58.1117 +- 58.1118 +- 58.1119 +- ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * 58.1120 ++ struct counter64 *ipSystemStatsHCInOctets_val_ptr); 58.1121 ++ int ipSystemStatsInHdrErrors_get(ipSystemStatsTable_rowreq_ctx * 58.1122 + rowreq_ctx, 58.1123 + u_long * 58.1124 + ipSystemStatsInHdrErrors_val_ptr); 58.1125 +- int 58.1126 +- 58.1127 +- 58.1128 +- 58.1129 +- 58.1130 +- 58.1131 +- 58.1132 +- 58.1133 +- 58.1134 +- 58.1135 +- 58.1136 +- 58.1137 +- 58.1138 +- 58.1139 +- 58.1140 +- 58.1141 +- ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 58.1142 ++ int ipSystemStatsInNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 58.1143 + rowreq_ctx, 58.1144 + u_long * 58.1145 + ipSystemStatsInNoRoutes_val_ptr); 58.1146 +- int 58.1147 +- 58.1148 +- 58.1149 +- 58.1150 +- 58.1151 +- 58.1152 +- 58.1153 +- 58.1154 +- 58.1155 +- 58.1156 +- 58.1157 +- 58.1158 +- 58.1159 +- 58.1160 +- 58.1161 +- 58.1162 +- ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * 58.1163 ++ int ipSystemStatsInAddrErrors_get(ipSystemStatsTable_rowreq_ctx * 58.1164 + rowreq_ctx, 58.1165 + u_long * 58.1166 + ipSystemStatsInAddrErrors_val_ptr); 58.1167 +- int 58.1168 +- 58.1169 +- 58.1170 +- 58.1171 +- 58.1172 +- 58.1173 +- 58.1174 +- 58.1175 +- 58.1176 +- 58.1177 +- 58.1178 +- 58.1179 +- 58.1180 +- 58.1181 +- 58.1182 +- 58.1183 +- ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * 58.1184 ++ int ipSystemStatsInUnknownProtos_get(ipSystemStatsTable_rowreq_ctx * 58.1185 + rowreq_ctx, 58.1186 + u_long * 58.1187 + ipSystemStatsInUnknownProtos_val_ptr); 58.1188 +- int 58.1189 +- 58.1190 +- 58.1191 +- 58.1192 +- 58.1193 +- 58.1194 +- 58.1195 +- 58.1196 +- 58.1197 +- 58.1198 +- 58.1199 +- 58.1200 +- 58.1201 +- 58.1202 +- 58.1203 +- 58.1204 +- ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1205 ++ int ipSystemStatsInTruncatedPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1206 + rowreq_ctx, 58.1207 + u_long * 58.1208 + ipSystemStatsInTruncatedPkts_val_ptr); 58.1209 +- int 58.1210 +- 58.1211 +- 58.1212 +- 58.1213 +- 58.1214 +- 58.1215 +- 58.1216 +- 58.1217 +- 58.1218 +- 58.1219 +- 58.1220 +- 58.1221 +- 58.1222 +- 58.1223 +- 58.1224 +- 58.1225 +- ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1226 ++ int ipSystemStatsInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1227 + rowreq_ctx, 58.1228 + u_long * 58.1229 + ipSystemStatsInForwDatagrams_val_ptr); 58.1230 +- int 58.1231 +- 58.1232 +- 58.1233 +- 58.1234 +- 58.1235 +- 58.1236 +- 58.1237 +- 58.1238 +- 58.1239 +- 58.1240 +- 58.1241 +- 58.1242 +- 58.1243 +- 58.1244 +- 58.1245 +- 58.1246 +- ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1247 ++ int ipSystemStatsHCInForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1248 + rowreq_ctx, 58.1249 +- U64 * 58.1250 ++ struct counter64 * 58.1251 + ipSystemStatsHCInForwDatagrams_val_ptr); 58.1252 +- int 58.1253 +- 58.1254 +- 58.1255 +- 58.1256 +- 58.1257 +- 58.1258 +- 58.1259 +- 58.1260 +- 58.1261 +- 58.1262 +- 58.1263 +- 58.1264 +- 58.1265 +- 58.1266 +- 58.1267 +- 58.1268 +- ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * 58.1269 ++ int ipSystemStatsReasmReqds_get(ipSystemStatsTable_rowreq_ctx * 58.1270 + rowreq_ctx, 58.1271 + u_long * 58.1272 + ipSystemStatsReasmReqds_val_ptr); 58.1273 +@@ -492,690 +245,142 @@ config_require(ip-mib/ipSystemStatsTable/ipSystemStatsTable_data_access) 58.1274 + * rowreq_ctx, 58.1275 + u_long * 58.1276 + ipSystemStatsReasmOKs_val_ptr); 58.1277 +- int 58.1278 +- 58.1279 +- 58.1280 +- 58.1281 +- 58.1282 +- 58.1283 +- 58.1284 +- 58.1285 +- 58.1286 +- 58.1287 +- 58.1288 +- 58.1289 +- 58.1290 +- 58.1291 +- 58.1292 +- 58.1293 +- ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * 58.1294 ++ int ipSystemStatsReasmFails_get(ipSystemStatsTable_rowreq_ctx * 58.1295 + rowreq_ctx, 58.1296 + u_long * 58.1297 + ipSystemStatsReasmFails_val_ptr); 58.1298 +- int 58.1299 +- 58.1300 +- 58.1301 +- 58.1302 +- 58.1303 +- 58.1304 +- 58.1305 +- 58.1306 +- 58.1307 +- 58.1308 +- 58.1309 +- 58.1310 +- 58.1311 +- 58.1312 +- 58.1313 +- 58.1314 +- ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * 58.1315 ++ int ipSystemStatsInDiscards_get(ipSystemStatsTable_rowreq_ctx * 58.1316 + rowreq_ctx, 58.1317 + u_long * 58.1318 + ipSystemStatsInDiscards_val_ptr); 58.1319 +- int 58.1320 +- 58.1321 +- 58.1322 +- 58.1323 +- 58.1324 +- 58.1325 +- 58.1326 +- 58.1327 +- 58.1328 +- 58.1329 +- 58.1330 +- 58.1331 +- 58.1332 +- 58.1333 +- 58.1334 +- 58.1335 +- ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * 58.1336 ++ int ipSystemStatsInDelivers_get(ipSystemStatsTable_rowreq_ctx * 58.1337 + rowreq_ctx, 58.1338 + u_long * 58.1339 + ipSystemStatsInDelivers_val_ptr); 58.1340 +- int 58.1341 +- 58.1342 +- 58.1343 +- 58.1344 +- 58.1345 +- 58.1346 +- 58.1347 +- 58.1348 +- 58.1349 +- 58.1350 +- 58.1351 +- 58.1352 +- 58.1353 +- 58.1354 +- 58.1355 +- 58.1356 +- ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * 58.1357 ++ int ipSystemStatsHCInDelivers_get(ipSystemStatsTable_rowreq_ctx * 58.1358 + rowreq_ctx, 58.1359 +- U64 * 58.1360 ++ struct counter64 * 58.1361 + ipSystemStatsHCInDelivers_val_ptr); 58.1362 +- int 58.1363 +- 58.1364 +- 58.1365 +- 58.1366 +- 58.1367 +- 58.1368 +- 58.1369 +- 58.1370 +- 58.1371 +- 58.1372 +- 58.1373 +- 58.1374 +- 58.1375 +- 58.1376 +- 58.1377 +- 58.1378 +- ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * 58.1379 ++ int ipSystemStatsOutRequests_get(ipSystemStatsTable_rowreq_ctx * 58.1380 + rowreq_ctx, 58.1381 + u_long * 58.1382 + ipSystemStatsOutRequests_val_ptr); 58.1383 +- int 58.1384 +- 58.1385 +- 58.1386 +- 58.1387 +- 58.1388 +- 58.1389 +- 58.1390 +- 58.1391 +- 58.1392 +- 58.1393 +- 58.1394 +- 58.1395 +- 58.1396 +- 58.1397 +- 58.1398 +- 58.1399 +- ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * 58.1400 ++ int ipSystemStatsHCOutRequests_get(ipSystemStatsTable_rowreq_ctx * 58.1401 + rowreq_ctx, 58.1402 +- U64 * 58.1403 ++ struct counter64 * 58.1404 + ipSystemStatsHCOutRequests_val_ptr); 58.1405 +- int 58.1406 +- 58.1407 +- 58.1408 +- 58.1409 +- 58.1410 +- 58.1411 +- 58.1412 +- 58.1413 +- 58.1414 +- 58.1415 +- 58.1416 +- 58.1417 +- 58.1418 +- 58.1419 +- 58.1420 +- 58.1421 +- ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 58.1422 ++ int ipSystemStatsOutNoRoutes_get(ipSystemStatsTable_rowreq_ctx * 58.1423 + rowreq_ctx, 58.1424 + u_long * 58.1425 + ipSystemStatsOutNoRoutes_val_ptr); 58.1426 +- int 58.1427 +- 58.1428 +- 58.1429 +- 58.1430 +- 58.1431 +- 58.1432 +- 58.1433 +- 58.1434 +- 58.1435 +- 58.1436 +- 58.1437 +- 58.1438 +- 58.1439 +- 58.1440 +- 58.1441 +- 58.1442 +- ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1443 ++ int ipSystemStatsOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1444 + rowreq_ctx, 58.1445 + u_long * 58.1446 + ipSystemStatsOutForwDatagrams_val_ptr); 58.1447 +- int 58.1448 +- 58.1449 +- 58.1450 +- 58.1451 +- 58.1452 +- 58.1453 +- 58.1454 +- 58.1455 +- 58.1456 +- 58.1457 +- 58.1458 +- 58.1459 +- 58.1460 +- 58.1461 +- 58.1462 +- 58.1463 +- ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1464 ++ int ipSystemStatsHCOutForwDatagrams_get(ipSystemStatsTable_rowreq_ctx * 58.1465 + rowreq_ctx, 58.1466 +- U64 * 58.1467 ++ struct counter64 * 58.1468 + ipSystemStatsHCOutForwDatagrams_val_ptr); 58.1469 +- int 58.1470 +- 58.1471 +- 58.1472 +- 58.1473 +- 58.1474 +- 58.1475 +- 58.1476 +- 58.1477 +- 58.1478 +- 58.1479 +- 58.1480 +- 58.1481 +- 58.1482 +- 58.1483 +- 58.1484 +- 58.1485 +- ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * 58.1486 ++ int ipSystemStatsOutDiscards_get(ipSystemStatsTable_rowreq_ctx * 58.1487 + rowreq_ctx, 58.1488 + u_long * 58.1489 + ipSystemStatsOutDiscards_val_ptr); 58.1490 +- int 58.1491 +- 58.1492 +- 58.1493 +- 58.1494 +- 58.1495 +- 58.1496 +- 58.1497 +- 58.1498 +- 58.1499 +- 58.1500 +- 58.1501 +- 58.1502 +- 58.1503 +- 58.1504 +- 58.1505 +- 58.1506 +- ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * 58.1507 ++ int ipSystemStatsOutFragReqds_get(ipSystemStatsTable_rowreq_ctx * 58.1508 + rowreq_ctx, 58.1509 + u_long * 58.1510 + ipSystemStatsOutFragReqds_val_ptr); 58.1511 +- int 58.1512 +- 58.1513 +- 58.1514 +- 58.1515 +- 58.1516 +- 58.1517 +- 58.1518 +- 58.1519 +- 58.1520 +- 58.1521 +- 58.1522 +- 58.1523 +- 58.1524 +- 58.1525 +- 58.1526 +- 58.1527 +- ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * 58.1528 ++ int ipSystemStatsOutFragOKs_get(ipSystemStatsTable_rowreq_ctx * 58.1529 + rowreq_ctx, 58.1530 + u_long * 58.1531 + ipSystemStatsOutFragOKs_val_ptr); 58.1532 +- int 58.1533 +- 58.1534 +- 58.1535 +- 58.1536 +- 58.1537 +- 58.1538 +- 58.1539 +- 58.1540 +- 58.1541 +- 58.1542 +- 58.1543 +- 58.1544 +- 58.1545 +- 58.1546 +- 58.1547 +- 58.1548 +- ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * 58.1549 ++ int ipSystemStatsOutFragFails_get(ipSystemStatsTable_rowreq_ctx * 58.1550 + rowreq_ctx, 58.1551 + u_long * 58.1552 + ipSystemStatsOutFragFails_val_ptr); 58.1553 +- int 58.1554 +- 58.1555 +- 58.1556 +- 58.1557 +- 58.1558 +- 58.1559 +- 58.1560 +- 58.1561 +- 58.1562 +- 58.1563 +- 58.1564 +- 58.1565 +- 58.1566 +- 58.1567 +- 58.1568 +- 58.1569 +- ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * 58.1570 ++ int ipSystemStatsOutFragCreates_get(ipSystemStatsTable_rowreq_ctx * 58.1571 + rowreq_ctx, 58.1572 + u_long * 58.1573 + ipSystemStatsOutFragCreates_val_ptr); 58.1574 +- int 58.1575 +- 58.1576 +- 58.1577 +- 58.1578 +- 58.1579 +- 58.1580 +- 58.1581 +- 58.1582 +- 58.1583 +- 58.1584 +- 58.1585 +- 58.1586 +- 58.1587 +- 58.1588 +- 58.1589 +- 58.1590 +- ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 58.1591 ++ int ipSystemStatsOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 58.1592 + rowreq_ctx, 58.1593 + u_long * 58.1594 + ipSystemStatsOutTransmits_val_ptr); 58.1595 +- int 58.1596 +- 58.1597 +- 58.1598 +- 58.1599 +- 58.1600 +- 58.1601 +- 58.1602 +- 58.1603 +- 58.1604 +- 58.1605 +- 58.1606 +- 58.1607 +- 58.1608 +- 58.1609 +- 58.1610 +- 58.1611 +- ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 58.1612 ++ int ipSystemStatsHCOutTransmits_get(ipSystemStatsTable_rowreq_ctx * 58.1613 + rowreq_ctx, 58.1614 +- U64 * 58.1615 ++ struct counter64 * 58.1616 + ipSystemStatsHCOutTransmits_val_ptr); 58.1617 +- int 58.1618 +- 58.1619 +- 58.1620 +- 58.1621 +- 58.1622 +- 58.1623 +- 58.1624 +- 58.1625 +- 58.1626 +- 58.1627 +- 58.1628 +- 58.1629 +- 58.1630 +- 58.1631 +- 58.1632 +- 58.1633 +- ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1634 ++ int ipSystemStatsOutOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1635 + rowreq_ctx, 58.1636 + u_long * 58.1637 + ipSystemStatsOutOctets_val_ptr); 58.1638 +- int 58.1639 +- 58.1640 +- 58.1641 +- 58.1642 +- 58.1643 +- 58.1644 +- 58.1645 +- 58.1646 +- 58.1647 +- 58.1648 +- 58.1649 +- 58.1650 +- 58.1651 +- 58.1652 +- 58.1653 +- 58.1654 +- ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1655 ++ int ipSystemStatsHCOutOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1656 + rowreq_ctx, 58.1657 +- U64 * 58.1658 ++ struct counter64 * 58.1659 + ipSystemStatsHCOutOctets_val_ptr); 58.1660 +- int 58.1661 +- 58.1662 +- 58.1663 +- 58.1664 +- 58.1665 +- 58.1666 +- 58.1667 +- 58.1668 +- 58.1669 +- 58.1670 +- 58.1671 +- 58.1672 +- 58.1673 +- 58.1674 +- 58.1675 +- 58.1676 +- ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1677 ++ int ipSystemStatsInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1678 + rowreq_ctx, 58.1679 + u_long * 58.1680 + ipSystemStatsInMcastPkts_val_ptr); 58.1681 +- int 58.1682 +- 58.1683 +- 58.1684 +- 58.1685 +- 58.1686 +- 58.1687 +- 58.1688 +- 58.1689 +- 58.1690 +- 58.1691 +- 58.1692 +- 58.1693 +- 58.1694 +- 58.1695 +- 58.1696 +- 58.1697 +- ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1698 ++ int ipSystemStatsHCInMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1699 + rowreq_ctx, 58.1700 +- U64 * 58.1701 ++ struct counter64 * 58.1702 + ipSystemStatsHCInMcastPkts_val_ptr); 58.1703 +- int 58.1704 +- 58.1705 +- 58.1706 +- 58.1707 +- 58.1708 +- 58.1709 +- 58.1710 +- 58.1711 +- 58.1712 +- 58.1713 +- 58.1714 +- 58.1715 +- 58.1716 +- 58.1717 +- 58.1718 +- 58.1719 +- ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1720 ++ int ipSystemStatsInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1721 + rowreq_ctx, 58.1722 + u_long * 58.1723 + ipSystemStatsInMcastOctets_val_ptr); 58.1724 +- int 58.1725 +- 58.1726 +- 58.1727 +- 58.1728 +- 58.1729 +- 58.1730 +- 58.1731 +- 58.1732 +- 58.1733 +- 58.1734 +- 58.1735 +- 58.1736 +- 58.1737 +- 58.1738 +- 58.1739 +- 58.1740 +- ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1741 ++ int ipSystemStatsHCInMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1742 + rowreq_ctx, 58.1743 +- U64 * 58.1744 ++ struct counter64 * 58.1745 + ipSystemStatsHCInMcastOctets_val_ptr); 58.1746 +- int 58.1747 +- 58.1748 +- 58.1749 +- 58.1750 +- 58.1751 +- 58.1752 +- 58.1753 +- 58.1754 +- 58.1755 +- 58.1756 +- 58.1757 +- 58.1758 +- 58.1759 +- 58.1760 +- 58.1761 +- 58.1762 +- ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1763 ++ int ipSystemStatsOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1764 + rowreq_ctx, 58.1765 + u_long * 58.1766 + ipSystemStatsOutMcastPkts_val_ptr); 58.1767 +- int 58.1768 +- 58.1769 +- 58.1770 +- 58.1771 +- 58.1772 +- 58.1773 +- 58.1774 +- 58.1775 +- 58.1776 +- 58.1777 +- 58.1778 +- 58.1779 +- 58.1780 +- 58.1781 +- 58.1782 +- 58.1783 +- ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1784 ++ int ipSystemStatsHCOutMcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1785 + rowreq_ctx, 58.1786 +- U64 * 58.1787 ++ struct counter64 * 58.1788 + ipSystemStatsHCOutMcastPkts_val_ptr); 58.1789 +- int 58.1790 +- 58.1791 +- 58.1792 +- 58.1793 +- 58.1794 +- 58.1795 +- 58.1796 +- 58.1797 +- 58.1798 +- 58.1799 +- 58.1800 +- 58.1801 +- 58.1802 +- 58.1803 +- 58.1804 +- 58.1805 +- ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1806 ++ int ipSystemStatsOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1807 + rowreq_ctx, 58.1808 + u_long * 58.1809 + ipSystemStatsOutMcastOctets_val_ptr); 58.1810 +- int 58.1811 +- 58.1812 +- 58.1813 +- 58.1814 +- 58.1815 +- 58.1816 +- 58.1817 +- 58.1818 +- 58.1819 +- 58.1820 +- 58.1821 +- 58.1822 +- 58.1823 +- 58.1824 +- 58.1825 +- 58.1826 +- ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1827 ++ int ipSystemStatsHCOutMcastOctets_get(ipSystemStatsTable_rowreq_ctx * 58.1828 + rowreq_ctx, 58.1829 +- U64 * 58.1830 ++ struct counter64 * 58.1831 + ipSystemStatsHCOutMcastOctets_val_ptr); 58.1832 +- int 58.1833 +- 58.1834 +- 58.1835 +- 58.1836 +- 58.1837 +- 58.1838 +- 58.1839 +- 58.1840 +- 58.1841 +- 58.1842 +- 58.1843 +- 58.1844 +- 58.1845 +- 58.1846 +- 58.1847 +- 58.1848 +- ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1849 ++ int ipSystemStatsInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1850 + rowreq_ctx, 58.1851 + u_long * 58.1852 + ipSystemStatsInBcastPkts_val_ptr); 58.1853 +- int 58.1854 +- 58.1855 +- 58.1856 +- 58.1857 +- 58.1858 +- 58.1859 +- 58.1860 +- 58.1861 +- 58.1862 +- 58.1863 +- 58.1864 +- 58.1865 +- 58.1866 +- 58.1867 +- 58.1868 +- 58.1869 +- ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1870 ++ int ipSystemStatsHCInBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1871 + rowreq_ctx, 58.1872 +- U64 * 58.1873 ++ struct counter64 * 58.1874 + ipSystemStatsHCInBcastPkts_val_ptr); 58.1875 +- int 58.1876 +- 58.1877 +- 58.1878 +- 58.1879 +- 58.1880 +- 58.1881 +- 58.1882 +- 58.1883 +- 58.1884 +- 58.1885 +- 58.1886 +- 58.1887 +- 58.1888 +- 58.1889 +- 58.1890 +- 58.1891 +- ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1892 ++ int ipSystemStatsOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1893 + rowreq_ctx, 58.1894 + u_long * 58.1895 + ipSystemStatsOutBcastPkts_val_ptr); 58.1896 +- int 58.1897 +- 58.1898 +- 58.1899 +- 58.1900 +- 58.1901 +- 58.1902 +- 58.1903 +- 58.1904 +- 58.1905 +- 58.1906 +- 58.1907 +- 58.1908 +- 58.1909 +- 58.1910 +- 58.1911 +- 58.1912 +- ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1913 ++ int ipSystemStatsHCOutBcastPkts_get(ipSystemStatsTable_rowreq_ctx * 58.1914 + rowreq_ctx, 58.1915 +- U64 * 58.1916 ++ struct counter64 * 58.1917 + ipSystemStatsHCOutBcastPkts_val_ptr); 58.1918 +- int 58.1919 +- 58.1920 +- 58.1921 +- 58.1922 +- 58.1923 +- 58.1924 +- 58.1925 +- 58.1926 +- 58.1927 +- 58.1928 +- 58.1929 +- 58.1930 +- 58.1931 +- 58.1932 +- 58.1933 +- 58.1934 +- ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * 58.1935 ++ int ipSystemStatsDiscontinuityTime_get(ipSystemStatsTable_rowreq_ctx * 58.1936 + rowreq_ctx, 58.1937 + u_long * 58.1938 + ipSystemStatsDiscontinuityTime_val_ptr); 58.1939 +- int 58.1940 +- 58.1941 +- 58.1942 +- 58.1943 +- 58.1944 +- 58.1945 +- 58.1946 +- 58.1947 +- 58.1948 +- 58.1949 +- 58.1950 +- 58.1951 +- 58.1952 +- 58.1953 +- 58.1954 +- 58.1955 +- ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * 58.1956 ++ int ipSystemStatsRefreshRate_get(ipSystemStatsTable_rowreq_ctx * 58.1957 + rowreq_ctx, 58.1958 + u_long * 58.1959 + ipSystemStatsRefreshRate_val_ptr); 58.1960 +- 58.1961 +- 58.1962 +- int 58.1963 +- 58.1964 +- 58.1965 +- 58.1966 +- 58.1967 +- 58.1968 +- 58.1969 +- 58.1970 +- 58.1971 +- 58.1972 +- 58.1973 +- 58.1974 +- 58.1975 +- 58.1976 +- 58.1977 +- 58.1978 +- ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index 58.1979 ++ int ipSystemStatsTable_indexes_set_tbl_idx(ipSystemStatsTable_mib_index 58.1980 + * tbl_idx, 58.1981 + u_long 58.1982 + ipSystemStatsIPVersion_val); 58.1983 +- int 58.1984 +- 58.1985 +- 58.1986 +- 58.1987 +- 58.1988 +- 58.1989 +- 58.1990 +- 58.1991 +- 58.1992 +- 58.1993 +- 58.1994 +- 58.1995 +- 58.1996 +- 58.1997 +- 58.1998 +- 58.1999 +- ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * 58.2000 ++ int ipSystemStatsTable_indexes_set(ipSystemStatsTable_rowreq_ctx * 58.2001 + rowreq_ctx, 58.2002 + u_long ipSystemStatsIPVersion_val); 58.2003 + 58.2004 +- 58.2005 +- 58.2006 + /* 58.2007 + ********************************************************************* 58.2008 + * SET function declarations 58.2009 +diff --git a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c 58.2010 +index e1ca2cb..09c061f 100644 58.2011 +--- a/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c 58.2012 ++++ b/agent/mibgroup/ip-mib/ipSystemStatsTable/ipSystemStatsTable_interface.c 58.2013 +@@ -674,10 +674,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2014 + * ipSystemStatsHCInReceives(4)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2015 + */ 58.2016 + case COLUMN_IPSYSTEMSTATSHCINRECEIVES: 58.2017 +- var->val_len = sizeof(U64); 58.2018 ++ var->val_len = sizeof(struct counter64); 58.2019 + var->type = ASN_COUNTER64; 58.2020 + rc = ipSystemStatsHCInReceives_get(rowreq_ctx, 58.2021 +- (U64 *) var->val.string); 58.2022 ++ (struct counter64 *) var->val.string); 58.2023 + break; 58.2024 + 58.2025 + /* 58.2026 +@@ -694,10 +694,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2027 + * ipSystemStatsHCInOctets(6)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2028 + */ 58.2029 + case COLUMN_IPSYSTEMSTATSHCINOCTETS: 58.2030 +- var->val_len = sizeof(U64); 58.2031 ++ var->val_len = sizeof(struct counter64); 58.2032 + var->type = ASN_COUNTER64; 58.2033 + rc = ipSystemStatsHCInOctets_get(rowreq_ctx, 58.2034 +- (U64 *) var->val.string); 58.2035 ++ (struct counter64 *) var->val.string); 58.2036 + break; 58.2037 + 58.2038 + /* 58.2039 +@@ -764,10 +764,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2040 + * ipSystemStatsHCInForwDatagrams(13)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2041 + */ 58.2042 + case COLUMN_IPSYSTEMSTATSHCINFORWDATAGRAMS: 58.2043 +- var->val_len = sizeof(U64); 58.2044 ++ var->val_len = sizeof(struct counter64); 58.2045 + var->type = ASN_COUNTER64; 58.2046 + rc = ipSystemStatsHCInForwDatagrams_get(rowreq_ctx, 58.2047 +- (U64 *) var->val.string); 58.2048 ++ (struct counter64 *) var->val.string); 58.2049 + break; 58.2050 + 58.2051 + /* 58.2052 +@@ -824,10 +824,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2053 + * ipSystemStatsHCInDelivers(19)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2054 + */ 58.2055 + case COLUMN_IPSYSTEMSTATSHCINDELIVERS: 58.2056 +- var->val_len = sizeof(U64); 58.2057 ++ var->val_len = sizeof(struct counter64); 58.2058 + var->type = ASN_COUNTER64; 58.2059 + rc = ipSystemStatsHCInDelivers_get(rowreq_ctx, 58.2060 +- (U64 *) var->val.string); 58.2061 ++ (struct counter64 *) var->val.string); 58.2062 + break; 58.2063 + 58.2064 + /* 58.2065 +@@ -844,10 +844,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2066 + * ipSystemStatsHCOutRequests(21)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2067 + */ 58.2068 + case COLUMN_IPSYSTEMSTATSHCOUTREQUESTS: 58.2069 +- var->val_len = sizeof(U64); 58.2070 ++ var->val_len = sizeof(struct counter64); 58.2071 + var->type = ASN_COUNTER64; 58.2072 + rc = ipSystemStatsHCOutRequests_get(rowreq_ctx, 58.2073 +- (U64 *) var->val.string); 58.2074 ++ (struct counter64 *) var->val.string); 58.2075 + break; 58.2076 + 58.2077 + /* 58.2078 +@@ -874,10 +874,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2079 + * ipSystemStatsHCOutForwDatagrams(24)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2080 + */ 58.2081 + case COLUMN_IPSYSTEMSTATSHCOUTFORWDATAGRAMS: 58.2082 +- var->val_len = sizeof(U64); 58.2083 ++ var->val_len = sizeof(struct counter64); 58.2084 + var->type = ASN_COUNTER64; 58.2085 + rc = ipSystemStatsHCOutForwDatagrams_get(rowreq_ctx, 58.2086 +- (U64 *) var->val.string); 58.2087 ++ (struct counter64 *) var->val.string); 58.2088 + break; 58.2089 + 58.2090 + /* 58.2091 +@@ -944,10 +944,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2092 + * ipSystemStatsHCOutTransmits(31)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2093 + */ 58.2094 + case COLUMN_IPSYSTEMSTATSHCOUTTRANSMITS: 58.2095 +- var->val_len = sizeof(U64); 58.2096 ++ var->val_len = sizeof(struct counter64); 58.2097 + var->type = ASN_COUNTER64; 58.2098 + rc = ipSystemStatsHCOutTransmits_get(rowreq_ctx, 58.2099 +- (U64 *) var->val.string); 58.2100 ++ (struct counter64 *) var->val.string); 58.2101 + break; 58.2102 + 58.2103 + /* 58.2104 +@@ -964,10 +964,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2105 + * ipSystemStatsHCOutOctets(33)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2106 + */ 58.2107 + case COLUMN_IPSYSTEMSTATSHCOUTOCTETS: 58.2108 +- var->val_len = sizeof(U64); 58.2109 ++ var->val_len = sizeof(struct counter64); 58.2110 + var->type = ASN_COUNTER64; 58.2111 + rc = ipSystemStatsHCOutOctets_get(rowreq_ctx, 58.2112 +- (U64 *) var->val.string); 58.2113 ++ (struct counter64 *) var->val.string); 58.2114 + break; 58.2115 + 58.2116 + /* 58.2117 +@@ -984,10 +984,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2118 + * ipSystemStatsHCInMcastPkts(35)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2119 + */ 58.2120 + case COLUMN_IPSYSTEMSTATSHCINMCASTPKTS: 58.2121 +- var->val_len = sizeof(U64); 58.2122 ++ var->val_len = sizeof(struct counter64); 58.2123 + var->type = ASN_COUNTER64; 58.2124 + rc = ipSystemStatsHCInMcastPkts_get(rowreq_ctx, 58.2125 +- (U64 *) var->val.string); 58.2126 ++ (struct counter64 *) var->val.string); 58.2127 + break; 58.2128 + 58.2129 + /* 58.2130 +@@ -1004,10 +1004,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2131 + * ipSystemStatsHCInMcastOctets(37)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2132 + */ 58.2133 + case COLUMN_IPSYSTEMSTATSHCINMCASTOCTETS: 58.2134 +- var->val_len = sizeof(U64); 58.2135 ++ var->val_len = sizeof(struct counter64); 58.2136 + var->type = ASN_COUNTER64; 58.2137 + rc = ipSystemStatsHCInMcastOctets_get(rowreq_ctx, 58.2138 +- (U64 *) var->val.string); 58.2139 ++ (struct counter64 *) var->val.string); 58.2140 + break; 58.2141 + 58.2142 + /* 58.2143 +@@ -1024,10 +1024,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2144 + * ipSystemStatsHCOutMcastPkts(39)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2145 + */ 58.2146 + case COLUMN_IPSYSTEMSTATSHCOUTMCASTPKTS: 58.2147 +- var->val_len = sizeof(U64); 58.2148 ++ var->val_len = sizeof(struct counter64); 58.2149 + var->type = ASN_COUNTER64; 58.2150 + rc = ipSystemStatsHCOutMcastPkts_get(rowreq_ctx, 58.2151 +- (U64 *) var->val.string); 58.2152 ++ (struct counter64 *) var->val.string); 58.2153 + break; 58.2154 + 58.2155 + /* 58.2156 +@@ -1044,10 +1044,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2157 + * ipSystemStatsHCOutMcastOctets(41)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2158 + */ 58.2159 + case COLUMN_IPSYSTEMSTATSHCOUTMCASTOCTETS: 58.2160 +- var->val_len = sizeof(U64); 58.2161 ++ var->val_len = sizeof(struct counter64); 58.2162 + var->type = ASN_COUNTER64; 58.2163 + rc = ipSystemStatsHCOutMcastOctets_get(rowreq_ctx, 58.2164 +- (U64 *) var->val.string); 58.2165 ++ (struct counter64 *) var->val.string); 58.2166 + break; 58.2167 + 58.2168 + /* 58.2169 +@@ -1064,10 +1064,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2170 + * ipSystemStatsHCInBcastPkts(43)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2171 + */ 58.2172 + case COLUMN_IPSYSTEMSTATSHCINBCASTPKTS: 58.2173 +- var->val_len = sizeof(U64); 58.2174 ++ var->val_len = sizeof(struct counter64); 58.2175 + var->type = ASN_COUNTER64; 58.2176 + rc = ipSystemStatsHCInBcastPkts_get(rowreq_ctx, 58.2177 +- (U64 *) var->val.string); 58.2178 ++ (struct counter64 *) var->val.string); 58.2179 + break; 58.2180 + 58.2181 + /* 58.2182 +@@ -1084,10 +1084,10 @@ _ipSystemStatsTable_get_column(ipSystemStatsTable_rowreq_ctx * rowreq_ctx, 58.2183 + * ipSystemStatsHCOutBcastPkts(45)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h 58.2184 + */ 58.2185 + case COLUMN_IPSYSTEMSTATSHCOUTBCASTPKTS: 58.2186 +- var->val_len = sizeof(U64); 58.2187 ++ var->val_len = sizeof(struct counter64); 58.2188 + var->type = ASN_COUNTER64; 58.2189 + rc = ipSystemStatsHCOutBcastPkts_get(rowreq_ctx, 58.2190 +- (U64 *) var->val.string); 58.2191 ++ (struct counter64 *) var->val.string); 58.2192 + break; 58.2193 + 58.2194 + /* 58.2195 +diff --git a/include/net-snmp/data_access/ipstats.h b/include/net-snmp/data_access/ipstats.h 58.2196 +index f782459..f0df46b 100644 58.2197 +--- a/include/net-snmp/data_access/ipstats.h 58.2198 ++++ b/include/net-snmp/data_access/ipstats.h 58.2199 +@@ -58,45 +58,45 @@ typedef struct netsnmp_ipstats_s { 58.2200 + * other columns, when underlying OS does not provide them. 58.2201 + * Always fill at least 32 bits, the table is periodically polled -> 32 bit 58.2202 + * overflow shall be detected and 64 bit value should be computed automatically. */ 58.2203 +- U64 HCInReceives; 58.2204 +- U64 HCInOctets; 58.2205 ++ struct counter64 HCInReceives; 58.2206 ++ struct counter64 HCInOctets; 58.2207 + u_long InHdrErrors; 58.2208 +- U64 HCInNoRoutes; 58.2209 ++ struct counter64 HCInNoRoutes; 58.2210 + u_long InAddrErrors; 58.2211 + u_long InUnknownProtos; 58.2212 + u_long InTruncatedPkts; 58.2213 + 58.2214 + /* optional, can be computed from HCInNoRoutes and HCOutForwDatagrams */ 58.2215 +- U64 HCInForwDatagrams; 58.2216 ++ struct counter64 HCInForwDatagrams; 58.2217 + 58.2218 + u_long ReasmReqds; 58.2219 + u_long ReasmOKs; 58.2220 + u_long ReasmFails; 58.2221 + u_long InDiscards; 58.2222 +- U64 HCInDelivers; 58.2223 +- U64 HCOutRequests; 58.2224 +- U64 HCOutNoRoutes; 58.2225 +- U64 HCOutForwDatagrams; 58.2226 +- U64 HCOutDiscards; 58.2227 ++ struct counter64 HCInDelivers; 58.2228 ++ struct counter64 HCOutRequests; 58.2229 ++ struct counter64 HCOutNoRoutes; 58.2230 ++ struct counter64 HCOutForwDatagrams; 58.2231 ++ struct counter64 HCOutDiscards; 58.2232 + 58.2233 + /* optional, can be computed from HCOutFragOKs + HCOutFragFails*/ 58.2234 +- U64 HCOutFragReqds; 58.2235 +- U64 HCOutFragOKs; 58.2236 +- U64 HCOutFragFails; 58.2237 +- U64 HCOutFragCreates; 58.2238 ++ struct counter64 HCOutFragReqds; 58.2239 ++ struct counter64 HCOutFragOKs; 58.2240 ++ struct counter64 HCOutFragFails; 58.2241 ++ struct counter64 HCOutFragCreates; 58.2242 + 58.2243 + /* optional, can be computed from 58.2244 + * HCOutRequests +HCOutForwDatagrams + HCOutFragCreates 58.2245 + * - HCOutFragReqds - HCOutNoRoutes - HCOutDiscards */ 58.2246 +- U64 HCOutTransmits; 58.2247 ++ struct counter64 HCOutTransmits; 58.2248 + 58.2249 +- U64 HCOutOctets; 58.2250 +- U64 HCInMcastPkts; 58.2251 +- U64 HCInMcastOctets; 58.2252 +- U64 HCOutMcastPkts; 58.2253 +- U64 HCOutMcastOctets; 58.2254 +- U64 HCInBcastPkts; 58.2255 +- U64 HCOutBcastPkts; 58.2256 ++ struct counter64 HCOutOctets; 58.2257 ++ struct counter64 HCInMcastPkts; 58.2258 ++ struct counter64 HCInMcastOctets; 58.2259 ++ struct counter64 HCOutMcastPkts; 58.2260 ++ struct counter64 HCOutMcastOctets; 58.2261 ++ struct counter64 HCInBcastPkts; 58.2262 ++ struct counter64 HCOutBcastPkts; 58.2263 + 58.2264 + /* Array of available columns.*/ 58.2265 + int columnAvail[IPSYSTEMSTATSTABLE_LAST+1]; 58.2266 +diff --git a/include/net-snmp/library/int64.h b/include/net-snmp/library/int64.h 58.2267 +index 9c7c894..3a85213 100644 58.2268 +--- a/include/net-snmp/library/int64.h 58.2269 ++++ b/include/net-snmp/library/int64.h 58.2270 +@@ -5,31 +5,29 @@ 58.2271 + extern "C" { 58.2272 + #endif 58.2273 + 58.2274 +- typedef struct counter64 U64; 58.2275 +- 58.2276 + #define I64CHARSZ 21 58.2277 + 58.2278 +- void divBy10(U64, U64 *, unsigned int *); 58.2279 +- void multBy10(U64, U64 *); 58.2280 +- void incrByU16(U64 *, unsigned int); 58.2281 +- void incrByU32(U64 *, unsigned int); 58.2282 ++ void divBy10(struct counter64, struct counter64 *, unsigned int *); 58.2283 ++ void multBy10(struct counter64, struct counter64 *); 58.2284 ++ void incrByU16(struct counter64 *, unsigned int); 58.2285 ++ void incrByU32(struct counter64 *, unsigned int); 58.2286 + NETSNMP_IMPORT 58.2287 +- void zeroU64(U64 *); 58.2288 +- int isZeroU64(const U64 *); 58.2289 ++ void zeroU64(struct counter64 *); 58.2290 ++ int isZeroU64(const struct counter64 *); 58.2291 + NETSNMP_IMPORT 58.2292 +- void printU64(char *, const U64 *); 58.2293 ++ void printU64(char *, const struct counter64 *); 58.2294 + NETSNMP_IMPORT 58.2295 +- void printI64(char *, const U64 *); 58.2296 +- int read64(U64 *, const char *); 58.2297 ++ void printI64(char *, const struct counter64 *); 58.2298 ++ int read64(struct counter64 *, const char *); 58.2299 + NETSNMP_IMPORT 58.2300 +- void u64Subtract(const U64 * pu64one, const U64 * pu64two, 58.2301 +- U64 * pu64out); 58.2302 +- void u64Incr(U64 * pu64out, const U64 * pu64one); 58.2303 +- void u64UpdateCounter(U64 * pu64out, const U64 * pu64one, 58.2304 +- const U64 * pu64two); 58.2305 +- void u64Copy(U64 * pu64one, const U64 * pu64two); 58.2306 ++ void u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, 58.2307 ++ struct counter64 *pu64out); 58.2308 ++ void u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one); 58.2309 ++ void u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, 58.2310 ++ const struct counter64 *pu64two); 58.2311 ++ void u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two); 58.2312 + 58.2313 +- int netsnmp_c64_check_for_32bit_wrap(U64 *old_val, U64 *new_val, 58.2314 ++ int netsnmp_c64_check_for_32bit_wrap(struct counter64 *old_val, struct counter64 *new_val, 58.2315 + int adjust); 58.2316 + NETSNMP_IMPORT 58.2317 + int netsnmp_c64_check32_and_update(struct counter64 *prev_val, 58.2318 +diff --git a/snmplib/int64.c b/snmplib/int64.c 58.2319 +index 51f1f32..951f813 100644 58.2320 +--- a/snmplib/int64.c 58.2321 ++++ b/snmplib/int64.c 58.2322 +@@ -33,7 +33,7 @@ 58.2323 + * @param[out] puR Remainder. 58.2324 + */ 58.2325 + void 58.2326 +-divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) 58.2327 ++divBy10(struct counter64 u64, struct counter64 *pu64Q, unsigned int *puR) 58.2328 + { 58.2329 + unsigned long ulT; 58.2330 + unsigned long ulQ; 58.2331 +@@ -83,7 +83,7 @@ divBy10(U64 u64, U64 * pu64Q, unsigned int *puR) 58.2332 + * @param[out] pu64P Product. 58.2333 + */ 58.2334 + void 58.2335 +-multBy10(U64 u64, U64 * pu64P) 58.2336 ++multBy10(struct counter64 u64, struct counter64 *pu64P) 58.2337 + { 58.2338 + unsigned long ulT; 58.2339 + unsigned long ulP; 58.2340 +@@ -130,7 +130,7 @@ multBy10(U64 u64, U64 * pu64P) 58.2341 + * 58.2342 + */ 58.2343 + void 58.2344 +-incrByU16(U64 * pu64, unsigned int u16) 58.2345 ++incrByU16(struct counter64 *pu64, unsigned int u16) 58.2346 + { 58.2347 + incrByU32(pu64, u16); 58.2348 + } 58.2349 +@@ -143,7 +143,7 @@ incrByU16(U64 * pu64, unsigned int u16) 58.2350 + * 58.2351 + */ 58.2352 + void 58.2353 +-incrByU32(U64 * pu64, unsigned int u32) 58.2354 ++incrByU32(struct counter64 *pu64, unsigned int u32) 58.2355 + { 58.2356 + uint32_t tmp; 58.2357 + 58.2358 +@@ -161,7 +161,7 @@ incrByU32(U64 * pu64, unsigned int u32) 58.2359 + * @param[out] pu64out pu64one - pu64two. 58.2360 + */ 58.2361 + void 58.2362 +-u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) 58.2363 ++u64Subtract(const struct counter64 *pu64one, const struct counter64 *pu64two, struct counter64 *pu64out) 58.2364 + { 58.2365 + int carry; 58.2366 + 58.2367 +@@ -177,7 +177,7 @@ u64Subtract(const U64 * pu64one, const U64 * pu64two, U64 * pu64out) 58.2368 + * @param[in,out] pu64out pu64out += pu64one. 58.2369 + */ 58.2370 + void 58.2371 +-u64Incr(U64 * pu64out, const U64 * pu64one) 58.2372 ++u64Incr(struct counter64 *pu64out, const struct counter64 *pu64one) 58.2373 + { 58.2374 + pu64out->high = (uint32_t)(pu64out->high + pu64one->high); 58.2375 + incrByU32(pu64out, pu64one->low); 58.2376 +@@ -191,9 +191,9 @@ u64Incr(U64 * pu64out, const U64 * pu64one) 58.2377 + * @param[out] pu64out pu64out += (pu64one - pu64two) 58.2378 + */ 58.2379 + void 58.2380 +-u64UpdateCounter(U64 * pu64out, const U64 * pu64one, const U64 * pu64two) 58.2381 ++u64UpdateCounter(struct counter64 *pu64out, const struct counter64 *pu64one, const struct counter64 *pu64two) 58.2382 + { 58.2383 +- U64 tmp; 58.2384 ++ struct counter64 tmp; 58.2385 + 58.2386 + u64Subtract(pu64one, pu64two, &tmp); 58.2387 + u64Incr(pu64out, &tmp); 58.2388 +@@ -208,7 +208,7 @@ netsnmp_feature_child_of(u64copy, netsnmp_unused) 58.2389 + * @param[out] pu64one Where to store the copy - *pu64one = *pu64two. 58.2390 + */ 58.2391 + void 58.2392 +-u64Copy(U64 * pu64one, const U64 * pu64two) 58.2393 ++u64Copy(struct counter64 *pu64one, const struct counter64 *pu64two) 58.2394 + { 58.2395 + *pu64one = *pu64two; 58.2396 + } 58.2397 +@@ -220,7 +220,7 @@ u64Copy(U64 * pu64one, const U64 * pu64two) 58.2398 + * @param[in] pu64 Number to be zeroed. 58.2399 + */ 58.2400 + void 58.2401 +-zeroU64(U64 * pu64) 58.2402 ++zeroU64(struct counter64 *pu64) 58.2403 + { 58.2404 + pu64->low = 0; 58.2405 + pu64->high = 0; 58.2406 +@@ -232,7 +232,7 @@ zeroU64(U64 * pu64) 58.2407 + * @param[in] pu64 Number to be checked. 58.2408 + */ 58.2409 + int 58.2410 +-isZeroU64(const U64 * pu64) 58.2411 ++isZeroU64(const struct counter64 *pu64) 58.2412 + { 58.2413 + return pu64->low == 0 && pu64->high == 0; 58.2414 + } 58.2415 +@@ -390,10 +390,10 @@ netsnmp_c64_check32_and_update(struct counter64 *prev_val, struct counter64 *new 58.2416 + /** Convert an unsigned 64-bit number to ASCII. */ 58.2417 + void 58.2418 + printU64(char *buf, /* char [I64CHARSZ+1]; */ 58.2419 +- const U64 * pu64) 58.2420 ++ const struct counter64 *pu64) 58.2421 + { 58.2422 +- U64 u64a; 58.2423 +- U64 u64b; 58.2424 ++ struct counter64 u64a; 58.2425 ++ struct counter64 u64b; 58.2426 + 58.2427 + char aRes[I64CHARSZ + 1]; 58.2428 + unsigned int u; 58.2429 +@@ -414,9 +414,9 @@ printU64(char *buf, /* char [I64CHARSZ+1]; */ 58.2430 + /** Convert a signed 64-bit number to ASCII. */ 58.2431 + void 58.2432 + printI64(char *buf, /* char [I64CHARSZ+1]; */ 58.2433 +- const U64 * pu64) 58.2434 ++ const struct counter64 *pu64) 58.2435 + { 58.2436 +- U64 u64a; 58.2437 ++ struct counter64 u64a; 58.2438 + 58.2439 + if (pu64->high & 0x80000000) { 58.2440 + u64a.high = (uint32_t) ~pu64->high; 58.2441 +@@ -429,11 +429,11 @@ printI64(char *buf, /* char [I64CHARSZ+1]; */ 58.2442 + } 58.2443 + } 58.2444 + 58.2445 +-/** Convert a signed 64-bit integer from ASCII to U64. */ 58.2446 ++/** Convert a signed 64-bit integer from ASCII to struct counter64. */ 58.2447 + int 58.2448 +-read64(U64 * i64, const char *str) 58.2449 ++read64(struct counter64 *i64, const char *str) 58.2450 + { 58.2451 +- U64 i64p; 58.2452 ++ struct counter64 i64p; 58.2453 + unsigned int u; 58.2454 + int sign = 0; 58.2455 + int ok = 0; 58.2456 +diff --git a/snmplib/read_config.c b/snmplib/read_config.c 58.2457 +index e159c27..ab5b6a3 100644 58.2458 +--- a/snmplib/read_config.c 58.2459 ++++ b/snmplib/read_config.c 58.2460 +@@ -2279,10 +2279,10 @@ read_config_read_memory(int type, char *readfrom, 58.2461 + return readfrom; 58.2462 + 58.2463 + case ASN_COUNTER64: 58.2464 +- if (*len < sizeof(U64)) 58.2465 ++ if (*len < sizeof(struct counter64)) 58.2466 + return NULL; 58.2467 +- *len = sizeof(U64); 58.2468 +- read64((U64 *) dataptr, readfrom); 58.2469 ++ *len = sizeof(struct counter64); 58.2470 ++ read64((struct counter64 *) dataptr, readfrom); 58.2471 + readfrom = skip_token(readfrom); 58.2472 + return readfrom; 58.2473 + } 58.2474 +diff --git a/testing/fulltests/unit-tests/T015int64_clib.c b/testing/fulltests/unit-tests/T015int64_clib.c 58.2475 +index 5f5f4b6..66f66b7 100644 58.2476 +--- a/testing/fulltests/unit-tests/T015int64_clib.c 58.2477 ++++ b/testing/fulltests/unit-tests/T015int64_clib.c 58.2478 +@@ -1,4 +1,4 @@ 58.2479 +-/* HEADER Testing 64-bit integer operations (U64). */ 58.2480 ++/* HEADER Testing 64-bit integer operations (struct counter64). */ 58.2481 + 58.2482 + int i, j; 58.2483 + char buf[22]; 58.2484 +@@ -15,7 +15,7 @@ static const int64_t intval[] = { 58.2485 + }; 58.2486 + 58.2487 + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 58.2488 +- U64 a, b; 58.2489 ++ struct counter64 a, b; 58.2490 + a.low = (uint32_t)intval[i]; 58.2491 + a.high = (uint32_t)(intval[i] >> 32); 58.2492 + printI64(buf, &a); 58.2493 +@@ -27,7 +27,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 58.2494 + 58.2495 + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 58.2496 + for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { 58.2497 +- U64 a, b; 58.2498 ++ struct counter64 a, b; 58.2499 + uint64_t d; 58.2500 + a.low = (uint32_t)intval[i]; 58.2501 + a.high = (uint32_t)(intval[i] >> 32); 58.2502 +@@ -43,7 +43,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 58.2503 + 58.2504 + for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 58.2505 + for (j = i; j < sizeof(intval)/sizeof(intval[0]); ++j) { 58.2506 +- U64 a, b, c; 58.2507 ++ struct counter64 a, b, c; 58.2508 + uint64_t d; 58.2509 + a.low = (uint32_t)intval[i]; 58.2510 + a.high = (uint32_t)(intval[i] >> 32); 58.2511 +@@ -58,7 +58,7 @@ for (i = 0; i < sizeof(intval)/sizeof(intval[0]); ++i) { 58.2512 + } 58.2513 + 58.2514 + { 58.2515 +- U64 old_val, new_val; 58.2516 ++ struct counter64 old_val, new_val; 58.2517 + old_val.low = 7; 58.2518 + old_val.high = 0; 58.2519 + new_val = old_val; 58.2520 +-- 58.2521 +2.8.2 58.2522 + 58.2523 +diff -puNr net-snmp-5.7.3.orig/perl/agent/default_store/Makefile.PL net-snmp-5.7.3/perl/agent/default_store/Makefile.PL 58.2524 +--- net-snmp-5.7.3.orig/perl/agent/default_store/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2525 ++++ net-snmp-5.7.3/perl/agent/default_store/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 58.2526 +@@ -1,3 +1,4 @@ 58.2527 ++package agent_default_store; 58.2528 + use ExtUtils::MakeMaker; 58.2529 + require 5; 58.2530 + use Config; 58.2531 +diff -puNr net-snmp-5.7.3.orig/perl/agent/Makefile.PL net-snmp-5.7.3/perl/agent/Makefile.PL 58.2532 +--- net-snmp-5.7.3.orig/perl/agent/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2533 ++++ net-snmp-5.7.3/perl/agent/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 58.2534 +@@ -1,3 +1,4 @@ 58.2535 ++package agent; 58.2536 + use ExtUtils::MakeMaker; 58.2537 + require 5; 58.2538 + use Config; 58.2539 +diff -puNr net-snmp-5.7.3.orig/perl/agent/Support/Makefile.PL net-snmp-5.7.3/perl/agent/Support/Makefile.PL 58.2540 +--- net-snmp-5.7.3.orig/perl/agent/Support/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2541 ++++ net-snmp-5.7.3/perl/agent/Support/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 58.2542 +@@ -1,3 +1,4 @@ 58.2543 ++package agent_Support; 58.2544 + use ExtUtils::MakeMaker; 58.2545 + require 5; 58.2546 + use Config; 58.2547 +diff -puNr net-snmp-5.7.3.orig/perl/AnyData_SNMP/Makefile.PL net-snmp-5.7.3/perl/AnyData_SNMP/Makefile.PL 58.2548 +--- net-snmp-5.7.3.orig/perl/AnyData_SNMP/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2549 ++++ net-snmp-5.7.3/perl/AnyData_SNMP/Makefile.PL 2016-05-11 00:02:32.570453079 +0200 58.2550 +@@ -1,3 +1,4 @@ 58.2551 ++package AnyData_SNMP; 58.2552 + use ExtUtils::MakeMaker; 58.2553 + # See lib/ExtUtils/MakeMaker.pm for details of how to influence 58.2554 + # the contents of the Makefile that is written. 58.2555 +diff -puNr net-snmp-5.7.3.orig/perl/ASN/Makefile.PL net-snmp-5.7.3/perl/ASN/Makefile.PL 58.2556 +--- net-snmp-5.7.3.orig/perl/ASN/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2557 ++++ net-snmp-5.7.3/perl/ASN/Makefile.PL 2016-05-11 00:02:32.551453196 +0200 58.2558 +@@ -1,3 +1,4 @@ 58.2559 ++package ASN; 58.2560 + use ExtUtils::MakeMaker; 58.2561 + require 5; 58.2562 + use Config; 58.2563 +diff -puNr net-snmp-5.7.3.orig/perl/default_store/Makefile.PL net-snmp-5.7.3/perl/default_store/Makefile.PL 58.2564 +--- net-snmp-5.7.3.orig/perl/default_store/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2565 ++++ net-snmp-5.7.3/perl/default_store/Makefile.PL 2016-05-11 00:02:32.572453066 +0200 58.2566 +@@ -1,3 +1,4 @@ 58.2567 ++package default_store; 58.2568 + use ExtUtils::MakeMaker; 58.2569 + require 5; 58.2570 + use Config; 58.2571 +diff -puNr net-snmp-5.7.3.orig/perl/manager/Makefile.PL net-snmp-5.7.3/perl/manager/Makefile.PL 58.2572 +--- net-snmp-5.7.3.orig/perl/manager/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2573 ++++ net-snmp-5.7.3/perl/manager/Makefile.PL 2016-05-11 00:02:32.572453066 +0200 58.2574 +@@ -1,3 +1,4 @@ 58.2575 ++package manager; 58.2576 + use ExtUtils::MakeMaker; 58.2577 + # See lib/ExtUtils/MakeMaker.pm for details of how to influence 58.2578 + # the contents of the Makefile that is written. 58.2579 +diff -puNr net-snmp-5.7.3.orig/perl/OID/Makefile.PL net-snmp-5.7.3/perl/OID/Makefile.PL 58.2580 +--- net-snmp-5.7.3.orig/perl/OID/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2581 ++++ net-snmp-5.7.3/perl/OID/Makefile.PL 2016-05-11 00:02:32.570453079 +0200 58.2582 +@@ -1,3 +1,4 @@ 58.2583 ++package OID; 58.2584 + # See lib/ExtUtils/MakeMaker.pm for details of how to influence 58.2585 + # the contents of the Makefile that is written. 58.2586 + 58.2587 +diff -puNr net-snmp-5.7.3.orig/perl/SNMP/Makefile.PL net-snmp-5.7.3/perl/SNMP/Makefile.PL 58.2588 +--- net-snmp-5.7.3.orig/perl/SNMP/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2589 ++++ net-snmp-5.7.3/perl/SNMP/Makefile.PL 2016-05-11 00:02:32.570453079 +0200 58.2590 +@@ -1,3 +1,4 @@ 58.2591 ++package SNMP; 58.2592 + use ExtUtils::MakeMaker; 58.2593 + require 5; 58.2594 + use Config; 58.2595 +diff -puNr net-snmp-5.7.3.orig/perl/TrapReceiver/Makefile.PL net-snmp-5.7.3/perl/TrapReceiver/Makefile.PL 58.2596 +--- net-snmp-5.7.3.orig/perl/TrapReceiver/Makefile.PL 2014-12-08 21:23:22.000000000 +0100 58.2597 ++++ net-snmp-5.7.3/perl/TrapReceiver/Makefile.PL 2016-05-11 00:02:32.571453072 +0200 58.2598 +@@ -1,3 +1,4 @@ 58.2599 ++package TrapReceiver; 58.2600 + use ExtUtils::MakeMaker; 58.2601 + require 5; 58.2602 + use Config;
59.1 --- a/net-snmp/stuff/patches/series Fri Mar 23 09:21:17 2018 +0100 59.2 +++ b/net-snmp/stuff/patches/series Fri Mar 23 10:45:35 2018 +0200 59.3 @@ -1,1 +1,3 @@ 59.4 -Fix-Perl-module-compilation.patch 59.5 +# from https://www.archlinux.org/packages/extra/x86_64/net-snmp/ 59.6 +-p1|net-snmp-5.7.3-perl-5.24.patch 59.7 +-p1|fix-openssl-build-errors.patch
60.1 --- a/netsurf-buildsystem/receipt Fri Mar 23 09:21:17 2018 +0100 60.2 +++ b/netsurf-buildsystem/receipt Fri Mar 23 10:45:35 2018 +0200 60.3 @@ -1,8 +1,8 @@ 60.4 # SliTaz package receipt v2. 60.5 60.6 PACKAGE="netsurf-buildsystem" 60.7 -COMMIT="37bf169dab81e00fb0c3fd6b35c992684f018c11" 60.8 -VERSION="1.5-170309" 60.9 +COMMIT="" 60.10 +VERSION="1.6" 60.11 CATEGORY="development" 60.12 SHORT_DESC="The Netsurf buildsystem" 60.13 MAINTAINER="al.bobylev@gmail.com" 60.14 @@ -30,4 +30,5 @@ 60.15 genpkg_rules() { 60.16 copy @std @dev 60.17 DEPENDS="perl" 60.18 + TAGS="netsurf" 60.19 }
61.1 --- a/netsurf/receipt Fri Mar 23 09:21:17 2018 +0100 61.2 +++ b/netsurf/receipt Fri Mar 23 10:45:35 2018 +0200 61.3 @@ -1,8 +1,8 @@ 61.4 # SliTaz package receipt v2. 61.5 61.6 PACKAGE="netsurf" 61.7 -COMMIT="d3493b138f38c9e26da24fcffb3ef8b813e3ca4e" 61.8 -VERSION="3.6-170919" 61.9 +COMMIT="" 61.10 +VERSION="3.7" 61.11 CATEGORY="network" 61.12 SHORT_DESC="Lightweight and fast web browser" 61.13 MAINTAINER="al.bobylev@gmail.com" 61.14 @@ -26,7 +26,7 @@ 61.15 [ -z "$COMMIT" ] && cd $VERSION 61.16 61.17 # Enable NetSurf's use of gstreamer for displaying videos 61.18 - echo 'override NETSURF_USE_VIDEO := YES' > Makefile.config 61.19 +# echo 'override NETSURF_USE_VIDEO := YES' > Makefile.config 61.20 # Enable NetSurf's use of libharu for PDF export and GTK printing support. 61.21 # echo 'override NETSURF_USE_HARU_PDF := YES' >> Makefile.config 61.22 # Template used for constructing the User Agent: string. 61.23 @@ -69,5 +69,5 @@ 61.24 gtk+ openssl libcss libcurl libdom libhubbub libjpeg-turbo libnsbmp \ 61.25 libnsgif libnslog libnspsl libnsutils libparserutils libpng16 \ 61.26 libsvgtiny libutf8proc libwapcaplet libxml2 pango zlib" 61.27 - TAGS="web-browser" 61.28 + TAGS="web-browser netsurf" 61.29 }
62.1 --- a/netsurf/stuff/patches/series Fri Mar 23 09:21:17 2018 +0100 62.2 +++ b/netsurf/stuff/patches/series Fri Mar 23 10:45:35 2018 +0200 62.3 @@ -6,6 +6,6 @@ 62.4 #netsurf-3.6-CFLAGS.patch 62.5 #netsurf-3.6-conditionally-include-image-headers.patch 62.6 #netsurf-3.6-pdf-writer.patch 62.7 -netsurf-3.6-gstreamer.patch 62.8 +#netsurf-3.6-gstreamer.patch 62.9 62.10 #headers.patch
63.1 --- a/notecase/receipt Fri Mar 23 09:21:17 2018 +0100 63.2 +++ b/notecase/receipt Fri Mar 23 10:45:35 2018 +0200 63.3 @@ -12,7 +12,7 @@ 63.4 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 63.5 63.6 BUILD_DEPENDS="gtk+-dev xorg-pixman-dev gtksourceview-dev gnome-vfs-dev \ 63.7 -GConf-dev gettext-tools" 63.8 +GConf-dev gettext-tools libgcrypt-dev" 63.9 63.10 compile_rules() { 63.11 export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
64.1 --- a/nss/receipt Fri Mar 23 09:21:17 2018 +0100 64.2 +++ b/nss/receipt Fri Mar 23 10:45:35 2018 +0200 64.3 @@ -1,7 +1,7 @@ 64.4 # SliTaz package receipt v2. 64.5 64.6 PACKAGE="nss" 64.7 -VERSION="3.29" 64.8 +VERSION="3.35" 64.9 CATEGORY="utilities" 64.10 SHORT_DESC="Mozilla Network Security Services (NSS)" 64.11 MAINTAINER="rocky@slitaz.org" 64.12 @@ -10,7 +10,7 @@ 64.13 LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/nss.html" 64.14 64.15 TARBALL="$PACKAGE-$VERSION.tar.gz" 64.16 -WGET_URL="http://ftp.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/${TARBALL}" 64.17 +WGET_URL="https://archive.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$TARBALL" 64.18 64.19 BUILD_DEPENDS="nspr-dev sqlite3-dev zlib-dev perl" 64.20 SPLIT="nss-dev" 64.21 @@ -21,22 +21,23 @@ 64.22 *) ARCH_ARGS='';; 64.23 esac 64.24 64.25 - cd nss && 64.26 + cd nss 64.27 make \ 64.28 -j1 \ 64.29 BUILD_OPT=1 \ 64.30 NSPR_INCLUDE_DIR=/usr/include/nspr \ 64.31 USE_SYSTEM_ZLIB=1 \ 64.32 ZLIB_LIBS=-lz \ 64.33 + NSS_ENABLE_WERROR=0 \ 64.34 $ARCH_ARGS \ 64.35 $([ -f /usr/include/sqlite3.h ] && echo NSS_USE_SYSTEM_SQLITE=1) || return 1 64.36 64.37 mkdir -p \ 64.38 - $install/usr/lib \ 64.39 - $install/usr/include/nss \ 64.40 - $install/usr/bin \ 64.41 - $install/usr/lib/pkgconfig \ 64.42 - $install/usr/include/nss 64.43 + $install/usr/lib/ \ 64.44 + $install/usr/include/nss/ \ 64.45 + $install/usr/bin/ \ 64.46 + $install/usr/lib/pkgconfig/ \ 64.47 + $install/usr/include/nss/ 64.48 cd ../dist 64.49 64.50 install -vm755 Linux*/lib/*.so $install/usr/lib/
65.1 --- a/nss/stuff/patches/nss-3.29-standalone-1.patch Fri Mar 23 09:21:17 2018 +0100 65.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 65.3 @@ -1,246 +0,0 @@ 65.4 -Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> 65.5 -Date: 2016-12-27 65.6 -Initial Package Version: 3.12.4 65.7 -Upstream Status: Not applicable 65.8 -Origin: Self, rediffed for nss-3.28. 65.9 -Description: Adds auto-generated nss.pc and nss-config script, and 65.10 - allows building without nspr in the source tree. 65.11 - 65.12 -diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile 65.13 ---- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600 65.14 -+++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600 65.15 -@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk 65.16 - # (7) Execute "local" rules. (OPTIONAL). # 65.17 - ####################################################################### 65.18 - 65.19 --nss_build_all: build_nspr all latest 65.20 -+nss_build_all: all latest 65.21 - 65.22 - nss_clean_all: clobber_nspr clobber 65.23 - 65.24 -diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile 65.25 ---- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 65.26 -+++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600 65.27 -@@ -0,0 +1,40 @@ 65.28 -+CORE_DEPTH = .. 65.29 -+DEPTH = .. 65.30 -+ 65.31 -+include $(CORE_DEPTH)/coreconf/config.mk 65.32 -+ 65.33 -+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` 65.34 -+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` 65.35 -+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` 65.36 -+PREFIX = /usr 65.37 -+ 65.38 -+all: export libs 65.39 -+ 65.40 -+export: 65.41 -+ # Create the nss.pc file 65.42 -+ mkdir -p $(DIST)/lib/pkgconfig 65.43 -+ sed -e "s,@prefix@,$(PREFIX)," \ 65.44 -+ -e "s,@exec_prefix@,\$${prefix}," \ 65.45 -+ -e "s,@libdir@,\$${prefix}/lib," \ 65.46 -+ -e "s,@includedir@,\$${prefix}/include/nss," \ 65.47 -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ 65.48 -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ 65.49 -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ 65.50 -+ nss.pc.in > nss.pc 65.51 -+ chmod 0644 nss.pc 65.52 -+ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig 65.53 -+ 65.54 -+ # Create the nss-config script 65.55 -+ mkdir -p $(DIST)/bin 65.56 -+ sed -e "s,@prefix@,$(PREFIX)," \ 65.57 -+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ 65.58 -+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ 65.59 -+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ 65.60 -+ nss-config.in > nss-config 65.61 -+ chmod 0755 nss-config 65.62 -+ ln -sf ../../../nss/config/nss-config $(DIST)/bin 65.63 -+ 65.64 -+libs: 65.65 -+ 65.66 -+dummy: all export libs 65.67 -+ 65.68 -diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in 65.69 ---- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 65.70 -+++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600 65.71 -@@ -0,0 +1,153 @@ 65.72 -+#!/bin/sh 65.73 -+ 65.74 -+prefix=@prefix@ 65.75 -+ 65.76 -+major_version=@NSS_MAJOR_VERSION@ 65.77 -+minor_version=@NSS_MINOR_VERSION@ 65.78 -+patch_version=@NSS_PATCH_VERSION@ 65.79 -+ 65.80 -+usage() 65.81 -+{ 65.82 -+ cat <<EOF 65.83 -+Usage: nss-config [OPTIONS] [LIBRARIES] 65.84 -+Options: 65.85 -+ [--prefix[=DIR]] 65.86 -+ [--exec-prefix[=DIR]] 65.87 -+ [--includedir[=DIR]] 65.88 -+ [--libdir[=DIR]] 65.89 -+ [--version] 65.90 -+ [--libs] 65.91 -+ [--cflags] 65.92 -+Dynamic Libraries: 65.93 -+ nss 65.94 -+ nssutil 65.95 -+ smime 65.96 -+ ssl 65.97 -+ softokn 65.98 -+EOF 65.99 -+ exit $1 65.100 -+} 65.101 -+ 65.102 -+if test $# -eq 0; then 65.103 -+ usage 1 1>&2 65.104 -+fi 65.105 -+ 65.106 -+lib_nss=yes 65.107 -+lib_nssutil=yes 65.108 -+lib_smime=yes 65.109 -+lib_ssl=yes 65.110 -+lib_softokn=yes 65.111 -+ 65.112 -+while test $# -gt 0; do 65.113 -+ case "$1" in 65.114 -+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; 65.115 -+ *) optarg= ;; 65.116 -+ esac 65.117 -+ 65.118 -+ case $1 in 65.119 -+ --prefix=*) 65.120 -+ prefix=$optarg 65.121 -+ ;; 65.122 -+ --prefix) 65.123 -+ echo_prefix=yes 65.124 -+ ;; 65.125 -+ --exec-prefix=*) 65.126 -+ exec_prefix=$optarg 65.127 -+ ;; 65.128 -+ --exec-prefix) 65.129 -+ echo_exec_prefix=yes 65.130 -+ ;; 65.131 -+ --includedir=*) 65.132 -+ includedir=$optarg 65.133 -+ ;; 65.134 -+ --includedir) 65.135 -+ echo_includedir=yes 65.136 -+ ;; 65.137 -+ --libdir=*) 65.138 -+ libdir=$optarg 65.139 -+ ;; 65.140 -+ --libdir) 65.141 -+ echo_libdir=yes 65.142 -+ ;; 65.143 -+ --version) 65.144 -+ echo ${major_version}.${minor_version}.${patch_version} 65.145 -+ ;; 65.146 -+ --cflags) 65.147 -+ echo_cflags=yes 65.148 -+ ;; 65.149 -+ --libs) 65.150 -+ echo_libs=yes 65.151 -+ ;; 65.152 -+ nss) 65.153 -+ lib_nss=yes 65.154 -+ ;; 65.155 -+ nssutil) 65.156 -+ lib_nssutil=yes 65.157 -+ ;; 65.158 -+ smime) 65.159 -+ lib_smime=yes 65.160 -+ ;; 65.161 -+ ssl) 65.162 -+ lib_ssl=yes 65.163 -+ ;; 65.164 -+ softokn) 65.165 -+ lib_softokn=yes 65.166 -+ ;; 65.167 -+ *) 65.168 -+ usage 1 1>&2 65.169 -+ ;; 65.170 -+ esac 65.171 -+ shift 65.172 -+done 65.173 -+ 65.174 -+# Set variables that may be dependent upon other variables 65.175 -+if test -z "$exec_prefix"; then 65.176 -+ exec_prefix=`pkg-config --variable=exec_prefix nss` 65.177 -+fi 65.178 -+if test -z "$includedir"; then 65.179 -+ includedir=`pkg-config --variable=includedir nss` 65.180 -+fi 65.181 -+if test -z "$libdir"; then 65.182 -+ libdir=`pkg-config --variable=libdir nss` 65.183 -+fi 65.184 -+ 65.185 -+if test "$echo_prefix" = "yes"; then 65.186 -+ echo $prefix 65.187 -+fi 65.188 -+ 65.189 -+if test "$echo_exec_prefix" = "yes"; then 65.190 -+ echo $exec_prefix 65.191 -+fi 65.192 -+ 65.193 -+if test "$echo_includedir" = "yes"; then 65.194 -+ echo $includedir 65.195 -+fi 65.196 -+ 65.197 -+if test "$echo_libdir" = "yes"; then 65.198 -+ echo $libdir 65.199 -+fi 65.200 -+ 65.201 -+if test "$echo_cflags" = "yes"; then 65.202 -+ echo -I$includedir 65.203 -+fi 65.204 -+ 65.205 -+if test "$echo_libs" = "yes"; then 65.206 -+ libdirs="-L$libdir" 65.207 -+ if test -n "$lib_nss"; then 65.208 -+ libdirs="$libdirs -lnss${major_version}" 65.209 -+ fi 65.210 -+ if test -n "$lib_nssutil"; then 65.211 -+ libdirs="$libdirs -lnssutil${major_version}" 65.212 -+ fi 65.213 -+ if test -n "$lib_smime"; then 65.214 -+ libdirs="$libdirs -lsmime${major_version}" 65.215 -+ fi 65.216 -+ if test -n "$lib_ssl"; then 65.217 -+ libdirs="$libdirs -lssl${major_version}" 65.218 -+ fi 65.219 -+ if test -n "$lib_softokn"; then 65.220 -+ libdirs="$libdirs -lsoftokn${major_version}" 65.221 -+ fi 65.222 -+ echo $libdirs 65.223 -+fi 65.224 -+ 65.225 -diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in 65.226 ---- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 65.227 -+++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600 65.228 -@@ -0,0 +1,12 @@ 65.229 -+prefix=@prefix@ 65.230 -+exec_prefix=@exec_prefix@ 65.231 -+libdir=@libdir@ 65.232 -+includedir=@includedir@ 65.233 -+ 65.234 -+Name: NSS 65.235 -+Description: Network Security Services 65.236 -+Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ 65.237 -+Requires: nspr >= 4.10 65.238 -+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ 65.239 -+Cflags: -I${includedir} 65.240 -+ 65.241 -diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn 65.242 ---- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600 65.243 -+++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600 65.244 -@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ 65.245 - 65.246 - RELEASE = nss 65.247 - 65.248 --DIRS = coreconf lib cmd gtests 65.249 -+DIRS = coreconf lib cmd gtests config
66.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 66.2 +++ b/nss/stuff/patches/nss-3.35-standalone-1.patch Fri Mar 23 10:45:35 2018 +0200 66.3 @@ -0,0 +1,247 @@ 66.4 +Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org> 66.5 +Date: 2016-12-27 66.6 +Initial Package Version: 3.12.4 66.7 +Upstream Status: Not applicable 66.8 +Origin: Self, rediffed for nss-3.28. 66.9 +Description: Adds auto-generated nss.pc and nss-config script, and 66.10 + allows building without nspr in the source tree. 66.11 + For 3.35, Requires: updated to nspr >= 4.18. 66.12 + 66.13 +diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile 66.14 +--- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600 66.15 ++++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600 66.16 +@@ -46,7 +46,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk 66.17 + # (7) Execute "local" rules. (OPTIONAL). # 66.18 + ####################################################################### 66.19 + 66.20 +-nss_build_all: build_nspr all latest 66.21 ++nss_build_all: all latest 66.22 + 66.23 + nss_clean_all: clobber_nspr clobber 66.24 + 66.25 +diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile 66.26 +--- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600 66.27 ++++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600 66.28 +@@ -0,0 +1,40 @@ 66.29 ++CORE_DEPTH = .. 66.30 ++DEPTH = .. 66.31 ++ 66.32 ++include $(CORE_DEPTH)/coreconf/config.mk 66.33 ++ 66.34 ++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'` 66.35 ++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'` 66.36 ++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'` 66.37 ++PREFIX = /usr 66.38 ++ 66.39 ++all: export libs 66.40 ++ 66.41 ++export: 66.42 ++ # Create the nss.pc file 66.43 ++ mkdir -p $(DIST)/lib/pkgconfig 66.44 ++ sed -e "s,@prefix@,$(PREFIX)," \ 66.45 ++ -e "s,@exec_prefix@,\$${prefix}," \ 66.46 ++ -e "s,@libdir@,\$${prefix}/lib," \ 66.47 ++ -e "s,@includedir@,\$${prefix}/include/nss," \ 66.48 ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \ 66.49 ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ 66.50 ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ 66.51 ++ nss.pc.in > nss.pc 66.52 ++ chmod 0644 nss.pc 66.53 ++ ln -sf ../../../../nss/config/nss.pc $(DIST)/lib/pkgconfig 66.54 ++ 66.55 ++ # Create the nss-config script 66.56 ++ mkdir -p $(DIST)/bin 66.57 ++ sed -e "s,@prefix@,$(PREFIX)," \ 66.58 ++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \ 66.59 ++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \ 66.60 ++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \ 66.61 ++ nss-config.in > nss-config 66.62 ++ chmod 0755 nss-config 66.63 ++ ln -sf ../../../nss/config/nss-config $(DIST)/bin 66.64 ++ 66.65 ++libs: 66.66 ++ 66.67 ++dummy: all export libs 66.68 ++ 66.69 +diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in 66.70 +--- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600 66.71 ++++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600 66.72 +@@ -0,0 +1,153 @@ 66.73 ++#!/bin/sh 66.74 ++ 66.75 ++prefix=@prefix@ 66.76 ++ 66.77 ++major_version=@NSS_MAJOR_VERSION@ 66.78 ++minor_version=@NSS_MINOR_VERSION@ 66.79 ++patch_version=@NSS_PATCH_VERSION@ 66.80 ++ 66.81 ++usage() 66.82 ++{ 66.83 ++ cat <<EOF 66.84 ++Usage: nss-config [OPTIONS] [LIBRARIES] 66.85 ++Options: 66.86 ++ [--prefix[=DIR]] 66.87 ++ [--exec-prefix[=DIR]] 66.88 ++ [--includedir[=DIR]] 66.89 ++ [--libdir[=DIR]] 66.90 ++ [--version] 66.91 ++ [--libs] 66.92 ++ [--cflags] 66.93 ++Dynamic Libraries: 66.94 ++ nss 66.95 ++ nssutil 66.96 ++ smime 66.97 ++ ssl 66.98 ++ softokn 66.99 ++EOF 66.100 ++ exit $1 66.101 ++} 66.102 ++ 66.103 ++if test $# -eq 0; then 66.104 ++ usage 1 1>&2 66.105 ++fi 66.106 ++ 66.107 ++lib_nss=yes 66.108 ++lib_nssutil=yes 66.109 ++lib_smime=yes 66.110 ++lib_ssl=yes 66.111 ++lib_softokn=yes 66.112 ++ 66.113 ++while test $# -gt 0; do 66.114 ++ case "$1" in 66.115 ++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; 66.116 ++ *) optarg= ;; 66.117 ++ esac 66.118 ++ 66.119 ++ case $1 in 66.120 ++ --prefix=*) 66.121 ++ prefix=$optarg 66.122 ++ ;; 66.123 ++ --prefix) 66.124 ++ echo_prefix=yes 66.125 ++ ;; 66.126 ++ --exec-prefix=*) 66.127 ++ exec_prefix=$optarg 66.128 ++ ;; 66.129 ++ --exec-prefix) 66.130 ++ echo_exec_prefix=yes 66.131 ++ ;; 66.132 ++ --includedir=*) 66.133 ++ includedir=$optarg 66.134 ++ ;; 66.135 ++ --includedir) 66.136 ++ echo_includedir=yes 66.137 ++ ;; 66.138 ++ --libdir=*) 66.139 ++ libdir=$optarg 66.140 ++ ;; 66.141 ++ --libdir) 66.142 ++ echo_libdir=yes 66.143 ++ ;; 66.144 ++ --version) 66.145 ++ echo ${major_version}.${minor_version}.${patch_version} 66.146 ++ ;; 66.147 ++ --cflags) 66.148 ++ echo_cflags=yes 66.149 ++ ;; 66.150 ++ --libs) 66.151 ++ echo_libs=yes 66.152 ++ ;; 66.153 ++ nss) 66.154 ++ lib_nss=yes 66.155 ++ ;; 66.156 ++ nssutil) 66.157 ++ lib_nssutil=yes 66.158 ++ ;; 66.159 ++ smime) 66.160 ++ lib_smime=yes 66.161 ++ ;; 66.162 ++ ssl) 66.163 ++ lib_ssl=yes 66.164 ++ ;; 66.165 ++ softokn) 66.166 ++ lib_softokn=yes 66.167 ++ ;; 66.168 ++ *) 66.169 ++ usage 1 1>&2 66.170 ++ ;; 66.171 ++ esac 66.172 ++ shift 66.173 ++done 66.174 ++ 66.175 ++# Set variables that may be dependent upon other variables 66.176 ++if test -z "$exec_prefix"; then 66.177 ++ exec_prefix=`pkg-config --variable=exec_prefix nss` 66.178 ++fi 66.179 ++if test -z "$includedir"; then 66.180 ++ includedir=`pkg-config --variable=includedir nss` 66.181 ++fi 66.182 ++if test -z "$libdir"; then 66.183 ++ libdir=`pkg-config --variable=libdir nss` 66.184 ++fi 66.185 ++ 66.186 ++if test "$echo_prefix" = "yes"; then 66.187 ++ echo $prefix 66.188 ++fi 66.189 ++ 66.190 ++if test "$echo_exec_prefix" = "yes"; then 66.191 ++ echo $exec_prefix 66.192 ++fi 66.193 ++ 66.194 ++if test "$echo_includedir" = "yes"; then 66.195 ++ echo $includedir 66.196 ++fi 66.197 ++ 66.198 ++if test "$echo_libdir" = "yes"; then 66.199 ++ echo $libdir 66.200 ++fi 66.201 ++ 66.202 ++if test "$echo_cflags" = "yes"; then 66.203 ++ echo -I$includedir 66.204 ++fi 66.205 ++ 66.206 ++if test "$echo_libs" = "yes"; then 66.207 ++ libdirs="-L$libdir" 66.208 ++ if test -n "$lib_nss"; then 66.209 ++ libdirs="$libdirs -lnss${major_version}" 66.210 ++ fi 66.211 ++ if test -n "$lib_nssutil"; then 66.212 ++ libdirs="$libdirs -lnssutil${major_version}" 66.213 ++ fi 66.214 ++ if test -n "$lib_smime"; then 66.215 ++ libdirs="$libdirs -lsmime${major_version}" 66.216 ++ fi 66.217 ++ if test -n "$lib_ssl"; then 66.218 ++ libdirs="$libdirs -lssl${major_version}" 66.219 ++ fi 66.220 ++ if test -n "$lib_softokn"; then 66.221 ++ libdirs="$libdirs -lsoftokn${major_version}" 66.222 ++ fi 66.223 ++ echo $libdirs 66.224 ++fi 66.225 ++ 66.226 +diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in 66.227 +--- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600 66.228 ++++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600 66.229 +@@ -0,0 +1,12 @@ 66.230 ++prefix=@prefix@ 66.231 ++exec_prefix=@exec_prefix@ 66.232 ++libdir=@libdir@ 66.233 ++includedir=@includedir@ 66.234 ++ 66.235 ++Name: NSS 66.236 ++Description: Network Security Services 66.237 ++Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ 66.238 ++Requires: nspr >= 4.18 66.239 ++Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@ 66.240 ++Cflags: -I${includedir} 66.241 ++ 66.242 +diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn 66.243 +--- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600 66.244 ++++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600 66.245 +@@ -10,4 +10,4 @@ IMPORTS = nspr20/v4.8 \ 66.246 + 66.247 + RELEASE = nss 66.248 + 66.249 +-DIRS = coreconf lib cmd cpputil gtests 66.250 ++DIRS = coreconf lib cmd cpputil gtests config
67.1 --- a/nss/stuff/patches/series Fri Mar 23 09:21:17 2018 +0100 67.2 +++ b/nss/stuff/patches/series Fri Mar 23 10:45:35 2018 +0200 67.3 @@ -1,1 +1,2 @@ 67.4 -nss-3.29-standalone-1.patch 67.5 +# from LFS 67.6 +nss-3.35-standalone-1.patch
68.1 --- a/ntl/receipt Fri Mar 23 09:21:17 2018 +0100 68.2 +++ b/ntl/receipt Fri Mar 23 10:45:35 2018 +0200 68.3 @@ -33,5 +33,5 @@ 68.4 } 68.5 68.6 genpkg_rules() { 68.7 - copy @std 68.8 + copy @dev 68.9 }
69.1 --- a/parted/receipt Fri Mar 23 09:21:17 2018 +0100 69.2 +++ b/parted/receipt Fri Mar 23 10:45:35 2018 +0200 69.3 @@ -16,9 +16,12 @@ 69.4 SPLIT="parted-dev" 69.5 69.6 compile_rules() { 69.7 + fix ld 69.8 ./configure \ 69.9 + --disable-device-mapper \ 69.10 --disable-static \ 69.11 $CONFIGURE_ARGS && 69.12 + fix libtool && 69.13 make && 69.14 make -C doc html && 69.15 makeinfo --html -o doc/html doc/parted.texi && 69.16 @@ -31,7 +34,7 @@ 69.17 genpkg_rules() { 69.18 case $PACKAGE in 69.19 parted) 69.20 - copy *.so* sbin/ 69.21 + copy @std 69.22 DEPENDS="ncurses readline util-linux-blkid util-linux-uuid" 69.23 SUGGESTED="btrfs-progs e2fsprogs f2fs-tools dosfstools mtools \ 69.24 hfsutils hfsprogs jfsutils util-linux lvm2 nilfs-utils ntfsprogs \ 69.25 @@ -39,7 +42,6 @@ 69.26 ;; 69.27 *-dev) 69.28 copy @dev 69.29 - DEPENDS="parted util-linux-blkid-dev util-linux-uuid-dev" 69.30 ;; 69.31 esac 69.32 }
70.1 --- a/viewnior/receipt Fri Mar 23 09:21:17 2018 +0100 70.2 +++ b/viewnior/receipt Fri Mar 23 10:45:35 2018 +0200 70.3 @@ -1,4 +1,4 @@ 70.4 -# SliTaz package receipt. 70.5 +# SliTaz package receipt v2. 70.6 70.7 PACKAGE="viewnior" 70.8 VERSION="1.6" 70.9 @@ -7,31 +7,27 @@ 70.10 MAINTAINER="pankso@slitaz.org" 70.11 LICENSE="GPL3" 70.12 WEB_SITE="http://siyanpanayotov.com/project/viewnior/" 70.13 + 70.14 TARBALL="$PACKAGE-$VERSION.tar.gz" 70.15 WGET_URL="https://github.com/xsisqox/Viewnior/archive/$TARBALL" 70.16 -TAGS="image photo viewer" 70.17 70.18 -DEPENDS="atk bzlib cairo exiv2 fontconfig freetype gcc-lib-base gdk-pixbuf \ 70.19 -glib glibc-base gtk+ harfbuzz libffi libpng16 xorg-libxcb libxml2 pango pcre \ 70.20 -xorg-pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib" 70.21 -BUILD_DEPENDS="automake libtool gtk+-dev exiv2-dev intltool" 70.22 +BUILD_DEPENDS_arm="automake libtool gtk+-dev exiv2-dev intltool" 70.23 +BUILD_DEPENDS="automake libtool gtk+-dev exiv2-dev intltool \ 70.24 +shared-mime-info-dev" 70.25 70.26 -case "$ARCH" in 70.27 - i?86) BUILD_DEPENDS="$BUILD_DEPENDS shared-mime-info-dev" ;; 70.28 -esac 70.29 - 70.30 -# Rules to configure and make the package. 70.31 -compile_rules() 70.32 -{ 70.33 +compile_rules() { 70.34 mkdir -p $src/m4 70.35 70.36 autoreconf -fi 70.37 ./configure $CONFIGURE_ARGS && make $MAKEFLAGS install 70.38 } 70.39 70.40 -# Rules to gen a SliTaz package suitable for Tazpkg. 70.41 -genpkg_rules() 70.42 -{ 70.43 +genpkg_rules() { 70.44 copy viewnior *.ui 70.45 cook_copy_icons 70.46 + DEPENDS="atk bzlib cairo exiv2 fontconfig freetype gcc-lib-base gdk-pixbuf \ 70.47 + glib glibc-base gtk+ harfbuzz libffi libpng16 xorg-libxcb libxml2 pango \ 70.48 + pcre xorg-pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ 70.49 + xorg-libXrender zlib" 70.50 + TAGS="image photo viewer" 70.51 }
71.1 --- a/wimlib/receipt Fri Mar 23 09:21:17 2018 +0100 71.2 +++ b/wimlib/receipt Fri Mar 23 10:45:35 2018 +0200 71.3 @@ -1,29 +1,34 @@ 71.4 -# SliTaz package receipt. 71.5 +# SliTaz package receipt v2. 71.6 71.7 PACKAGE="wimlib" 71.8 -VERSION="1.5.1" 71.9 +VERSION="1.12.0" 71.10 CATEGORY="utilities" 71.11 -SHORT_DESC="Library to create, extract, and modify Windows Imaging (WIM) files." 71.12 +SHORT_DESC="Library to create, extract, and modify Windows Imaging (WIM) files" 71.13 MAINTAINER="pascal.bellard@slitaz.org" 71.14 LICENSE="GPL3" 71.15 +WEB_SITE="https://wimlib.net/" 71.16 + 71.17 TARBALL="$PACKAGE-$VERSION.tar.gz" 71.18 -WEB_SITE="http://sourceforge.net/projects/wimlib/" 71.19 -WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 71.20 +WGET_URL="https://wimlib.net/downloads/$TARBALL" 71.21 71.22 -DEPENDS="libxml2 fuse ntfs-3g openssl zlib mtools cdrkit syslinux cabextract" 71.23 -BUILD_DEPENDS="libxml2-dev fuse-dev ntfs-3g-dev openssl-dev \ 71.24 -attr-dev mtools cdrkit syslinux cabextract" 71.25 +BUILD_DEPENDS="libxml2-dev ntfs-3g-dev fuse2-dev openssl-dev" 71.26 +SPLIT="wimlib-dev" 71.27 71.28 -# Rules to configure and make the package. 71.29 -compile_rules() 71.30 -{ 71.31 - cd $src 71.32 - ./configure --prefix=/usr $CONFIGURE_ARGS && 71.33 - make && make DESTDIR=$DESTDIR install 71.34 +compile_rules() { 71.35 + ./configure $CONFIGURE_ARGS && make && make install 71.36 } 71.37 71.38 -# Rules to gen a SliTaz package suitable for Tazpkg. 71.39 -genpkg_rules() 71.40 -{ 71.41 - cp -a $install/usr $fs 71.42 +genpkg_rules() { 71.43 + case $PACKAGE in 71.44 + wimlib) 71.45 + copy @std 71.46 + DEPENDS="fuse2 liblzma libxml2 ntfs-3g openssl zlib \ 71.47 + mtools cdrkit syslinux cabextract" 71.48 + ;; 71.49 + *-dev) 71.50 + copy @dev 71.51 + DEPENDS="wimlib \ 71.52 + fuse2-dev libxml2-dev ntfs-3g-dev openssl-dev" 71.53 + ;; 71.54 + esac 71.55 }