wok rev 25550

Add apachetop & mysqlsniffer
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Apr 03 16:35:42 2023 +0000 (13 months ago)
parents 93d377d13ba0
children 23441bc814ae
files BootProg/stuff/boot16.asm BootProg/stuff/boot32.asm BootProg/stuff/bootex.asm apachetop/receipt libnsl-dev/receipt libnsl/receipt mysqlsniffer/receipt pyroom/receipt samba-pam/receipt samba/receipt
line diff
     1.1 --- a/BootProg/stuff/boot16.asm	Mon Apr 03 06:53:23 2023 +0100
     1.2 +++ b/BootProg/stuff/boot16.asm	Mon Apr 03 16:35:42 2023 +0000
     1.3 @@ -89,7 +89,7 @@
     1.4  LBAsupport              equ     1               ; +16 bytes
     1.5  Over2GB                 equ     1               ; +5 bytes
     1.6  GeometryCheck           equ     1               ; +18 bytes
     1.7 -SectorOf512Bytes        equ     1               ; -4/-6 bytes
     1.8 +SectorOf512Bytes        equ     0               ; -4/-6 bytes
     1.9  CheckAttrib             equ     0               ; +6 bytes
    1.10  
    1.11  [BITS 16]
    1.12 @@ -323,7 +323,7 @@
    1.13  
    1.14  FAT12          equ       1
    1.15  FAT16          equ       1
    1.16 -TINYFAT16      equ       1
    1.17 +TINYFAT16      equ       1              ; < 4072 clusters fat16 support
    1.18          push    di                      ; up to 2 * 635K / BytesPerCluster = 2540 bytes
    1.19  %if FAT12 == 1
    1.20          mov     cl, 12
    1.21 @@ -339,7 +339,7 @@
    1.22   %if FAT12 == 1
    1.23          mov     dx, 0FFF6h
    1.24    %if TINYFAT16 == 1
    1.25 -        test    [bx(bsFileSystem+4)], cl ; FAT12 or FAT16 ? clear C
    1.26 +        test    [bx(bsFileSystem+4)], cl ; FAT12 or FAT16 ? clear C (bit 2)
    1.27          jne     ReadClusterFat16
    1.28    %else
    1.29          cmp     [bx(bpbSectorsPerFAT)], cx ; 1..12 = FAT12, 16..256 = FAT16
     2.1 --- a/BootProg/stuff/boot32.asm	Mon Apr 03 06:53:23 2023 +0100
     2.2 +++ b/BootProg/stuff/boot32.asm	Mon Apr 03 16:35:42 2023 +0000
     2.3 @@ -497,7 +497,6 @@
     2.4  ;; Input:  EAX = LBA                        ;;
     2.5  ;;         CX    = sector count             ;;
     2.6  ;;         ES:BX -> buffer address          ;;
     2.7 -;; Output: CF = 0 if no more sectors        ;;
     2.8  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     2.9  
    2.10  ReadSectorLBA:
     3.1 --- a/BootProg/stuff/bootex.asm	Mon Apr 03 06:53:23 2023 +0100
     3.2 +++ b/BootProg/stuff/bootex.asm	Mon Apr 03 16:35:42 2023 +0000
     3.3 @@ -80,8 +80,8 @@
     3.4  %define si(label)       si+label-boot
     3.5  NullEntryCheck          equ     1               ; +3 bytes
     3.6  ReadRetry               equ     1               ; +8 bytes
     3.7 -SectorOf512Bytes        equ     1               ; -13 bytes
     3.8 -CheckAttrib             equ     0               ; +19 bytes
     3.9 +SectorOf512Bytes        equ     0               ; -11 bytes
    3.10 +CheckAttrib             equ     0               ; +18 bytes
    3.11  
    3.12  [BITS 16]
    3.13  [CPU 386]
    3.14 @@ -210,7 +210,7 @@
    3.15          cmp     byte [es:di], 85h       ; EXFAT_ENTRY_FILE ?
    3.16          jne     NotEntryFile
    3.17          mov     al, [es:di+Attributes]
    3.18 -        mov     [bx+32], al
    3.19 +        mov     [ProgramName+NameLength+1], al
    3.20  NotEntryFile:
    3.21  %endif
    3.22  %if NullEntryCheck != 0
    3.23 @@ -246,7 +246,7 @@
    3.24  VolumeLabel     equ  8
    3.25  SubDirectory    equ  10h
    3.26          jnz     SkipFindName
    3.27 -        test    byte [bx+32], VolumeLabel+SubDirectory
    3.28 +        test    byte [si], VolumeLabel+SubDirectory
    3.29  SkipFindName:
    3.30  %endif
    3.31          je      FindNameFound           ; cx = 0
    3.32 @@ -267,6 +267,8 @@
    3.33  
    3.34  ;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.35  ;; Load the entire file ;;
    3.36 +;; Input: ESI = cluster ;;
    3.37 +;;        CX  = 0       ;; 
    3.38  ;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.39  
    3.40          push    es
    3.41 @@ -396,15 +398,15 @@
    3.42  ;; Reads a exFAT cluster         ;;
    3.43  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.44  ;; Input:  EDX:EAX = LBA         ;;
    3.45 -;;         EBX     = 0           ;;
    3.46  ;;         CX      = sector cnt  ;;
    3.47  ;;         ESI     = cluster no  ;;
    3.48  ;;         ES:0   -> buffer adrs ;;
    3.49 -;; Output: EBX     = 0           ;;
    3.50 -;;         CX      = next cnt    ;;
    3.51 +;; Output: EDX:EAX = next LBA    ;;
    3.52 +;;         CX      = sector cnt  ;;
    3.53 +;;         ESI     = cluster no  ;;
    3.54  ;;         EBP     = bytes/sector;;
    3.55 -;;         ES:0   -> next adrs   ;;
    3.56 -;;         C=0 for last sector   ;;
    3.57 +;; Keep:   EDI     = 0           ;;
    3.58 +;;         EBX     = 0           ;;
    3.59  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.60  
    3.61  ReadCluster:
    3.62 @@ -417,9 +419,9 @@
    3.63  %if SectorOf512Bytes != 0
    3.64          mov     al, 128
    3.65  %else
    3.66 -        mov     cl, -2
    3.67 -        add     cl, [bx(bpbSectorSizeBits)]
    3.68 -        bts     ax, cx                          ; eax=# of exFAT entries per sector
    3.69 +        mov     ah, 40h
    3.70 +        mov     cx, [bx(bpbSectorSizeBits)]
    3.71 +        rol     ax, cl                          ; eax=# of exFAT entries per sector
    3.72  %endif
    3.73          lea     edi, [esi-2]                    ; edi=cluster #-2
    3.74          xchg    eax, esi
    3.75 @@ -433,7 +435,11 @@
    3.76  
    3.77          mov     esi, [es:si]                    ; esi=next cluster #
    3.78  
    3.79 +%if SectorOf512Bytes != 0
    3.80          mov     dl, [bx(bpbSectorPerClusterBits)]
    3.81 +%else
    3.82 +        mov     dl, ch
    3.83 +%endif
    3.84          xor     ecx, ecx
    3.85          bts     ecx, edx                        ; 10000h max (32MB cluster)
    3.86          xchg    eax, edi                        ; get cluster #-2
    3.87 @@ -449,13 +455,12 @@
    3.88  ;; Reads a sector using BIOS Int 13h ;;
    3.89  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    3.90  ;; Input:  EDX:EAX = LBA             ;;
    3.91 -;;         BX      = 0               ;;
    3.92 -;;         CX      = sector count    ;;
    3.93  ;;         ES:0   -> buffer address  ;;
    3.94 -;; Output: BX      = 0               ;;
    3.95 -;;         CX      = next count      ;;
    3.96 -;;         EBP     = bytes/sector    ;;
    3.97 -;;         ES:0   -> next address    ;;
    3.98 +;; Output: EBP     = bytes/sector    ;;
    3.99 +;; Keep:   ESI     = cluster         ;;
   3.100 +;;         EDI     = FAT sector or 0 ;;
   3.101 +;;         ECX     = sector count    ;;
   3.102 +;;         EBX     = 0               ;;
   3.103  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   3.104  
   3.105  %if SectorOf512Bytes != 0
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/apachetop/receipt	Mon Apr 03 16:35:42 2023 +0000
     4.3 @@ -0,0 +1,38 @@
     4.4 +# SliTaz package receipt.
     4.5 +
     4.6 +PACKAGE="apachetop"
     4.7 +VERSION="0.23.2"
     4.8 +CATEGORY="network"
     4.9 +SHORT_DESC="Watches a logfile generated by Apache"
    4.10 +MAINTAINER="pascal.bellard@slitaz.org"
    4.11 +LICENSE="BSD"
    4.12 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    4.13 +WEB_SITE="https://github.com/tessus/apachetop"
    4.14 +WGET_URL="$WEB_SITE/archive/refs/tags/$VERSION.tar.gz"
    4.15 +
    4.16 +DEPENDS="gamin pcre2 readline ncurses"
    4.17 +BUILD_DEPENDS="gamin-dev pcre2-dev readline-dev ncurses-dev automake libtool"
    4.18 +
    4.19 +# What is the latest version available today?
    4.20 +current_version()
    4.21 +{
    4.22 +	wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \
    4.23 +	sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q'
    4.24 +}
    4.25 +
    4.26 +# Rules to configure and make the package.
    4.27 +compile_rules()
    4.28 +{
    4.29 +	./autogen.sh
    4.30 +	./configure &&
    4.31 +	make &&
    4.32 +	make install
    4.33 +	make DESTDIR=$DESTDIR install
    4.34 +}
    4.35 +
    4.36 +# Rules to gen a SliTaz package suitable for Tazpkg.
    4.37 +genpkg_rules()
    4.38 +{
    4.39 +	mkdir -p $fs/usr
    4.40 +	cp -a $install/usr/bin $fs/usr/
    4.41 +}
     5.1 --- a/libnsl-dev/receipt	Mon Apr 03 06:53:23 2023 +0100
     5.2 +++ b/libnsl-dev/receipt	Mon Apr 03 16:35:42 2023 +0000
     5.3 @@ -6,7 +6,7 @@
     5.4  SHORT_DESC="Public client interface library for NIS(YP) and NIS+ - development files."
     5.5  MAINTAINER="maintainer@slitaz.org"
     5.6  LICENSE="LGPL2+"
     5.7 -WEB_SITE="https://www.thkukuk.de/nis/"
     5.8 +WEB_SITE="https://github.com/thkukuk/libnsl/"
     5.9  
    5.10  DEPENDS="libnsl"
    5.11  WANTED="libnsl"
     6.1 --- a/libnsl/receipt	Mon Apr 03 06:53:23 2023 +0100
     6.2 +++ b/libnsl/receipt	Mon Apr 03 16:35:42 2023 +0000
     6.3 @@ -6,10 +6,10 @@
     6.4  SHORT_DESC="Public client interface library for NIS(YP) and NIS+."
     6.5  MAINTAINER="maintainer@slitaz.org"
     6.6  LICENSE="LGPL2+"
     6.7 -WEB_SITE="https://www.thkukuk.de/nis/"
     6.8 +WEB_SITE="https://github.com/thkukuk/libnsl/"
     6.9  
    6.10  TARBALL="$PACKAGE-$VERSION.tar.xz"
    6.11 -WGET_URL="https://github.com/thkukuk/$PACKAGE/releases/download/v$VERSION/$TARBALL"
    6.12 +WGET_URL="https://github.com/thkukuk/libnsl/releases/download/v$VERSION/$TARBALL"
    6.13  
    6.14  # What is the latest version available today?
    6.15  current_version()
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/mysqlsniffer/receipt	Mon Apr 03 16:35:42 2023 +0000
     7.3 @@ -0,0 +1,37 @@
     7.4 +# SliTaz package receipt.
     7.5 +
     7.6 +PACKAGE="mysqlsniffer"
     7.7 +GITHASH="37410e18bc8a407be59a19a0cbf10c8ab4469fa2"
     7.8 +VERSION="2021"
     7.9 +CATEGORY="network"
    7.10 +SHORT_DESC="Watch MySQL traffic on a TCP/IP network"
    7.11 +MAINTAINER="pascal.bellard@slitaz.org"
    7.12 +LICENSE="GPL3"
    7.13 +TARBALL="$PACKAGE-$VERSION.zip"
    7.14 +WEB_SITE="https://github.com/daniel-nichter/hackmysql.com/"
    7.15 +WGET_URL="$WEB_SITE/archive/$GITHASH.zip"
    7.16 +
    7.17 +DEPENDS="libpcap"
    7.18 +BUILD_DEPENDS="libpcap-dev"
    7.19 +
    7.20 +# What is the latest version available today?
    7.21 +current_version()
    7.22 +{
    7.23 +	wget -O - $WEB_SITE/commits/master 2>/dev/null | \
    7.24 +	sed '/Commits on/!d;s|.*on |"|;s|<.*|"|;q' | xargs date +%Y -d
    7.25 +}
    7.26 +
    7.27 +# Rules to configure and make the package.
    7.28 +compile_rules()
    7.29 +{
    7.30 +	cd mysqlsniffer
    7.31 +	gcc -O2 -lpcap -o mysqlsniffer mysqlsniffer.c packet_handlers.c misc.c
    7.32 +}
    7.33 +
    7.34 +
    7.35 +# Rules to gen a SliTaz package suitable for Tazpkg.
    7.36 +genpkg_rules()
    7.37 +{
    7.38 +	mkdir -p $fs/usr/bin
    7.39 +	cp -a $src/mysqlsniffer/mysqlsniffer $fs/usr/bin
    7.40 +}
     8.1 --- a/pyroom/receipt	Mon Apr 03 06:53:23 2023 +0100
     8.2 +++ b/pyroom/receipt	Mon Apr 03 16:35:42 2023 +0000
     8.3 @@ -7,7 +7,7 @@
     8.4  MAINTAINER="paul@slitaz.org"
     8.5  LICENSE="GPL3"
     8.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
     8.7 -WEB_SITE="http://pyroom.org/"
     8.8 +WEB_SITE="https://launchpad.net/pyroom/"
     8.9  WGET_URL="https://launchpad.net/pyroom/${VERSION%.*}/$VERSION/+download/$TARBALL"
    8.10  
    8.11  DEPENDS="python pygtk python-xdg libffi"
    8.12 @@ -16,7 +16,7 @@
    8.13  # What is the latest version available today?
    8.14  current_version()
    8.15  {
    8.16 -	wget -O - $WEB_SITE 2>/dev/null | \
    8.17 +	wget -O - http://pyroom.org/ 2>/dev/null | \
    8.18  	sed '/PyRoom [0-9]/!d;s|.*Room ||;s| released.*||;q'
    8.19  }
    8.20  
     9.1 --- a/samba-pam/receipt	Mon Apr 03 06:53:23 2023 +0100
     9.2 +++ b/samba-pam/receipt	Mon Apr 03 16:35:42 2023 +0000
     9.3 @@ -8,7 +8,7 @@
     9.4  LICENSE="GPL3"
     9.5  SOURCE="samba"
     9.6  TARBALL="$SOURCE-$VERSION.tar.gz"
     9.7 -WEB_SITE="https://samba.org/"
     9.8 +WEB_SITE="https://www.samba.org/"
     9.9  WGET_URL="${WEB_SITE}$SOURCE/ftp/stable/$TARBALL"
    9.10  TAZPANEL_DAEMON="man::samba|edit::/etc/samba/smb.conf|web::$WEB_SITE"
    9.11  SUGGESTED="gamin"
    10.1 --- a/samba/receipt	Mon Apr 03 06:53:23 2023 +0100
    10.2 +++ b/samba/receipt	Mon Apr 03 16:35:42 2023 +0000
    10.3 @@ -7,7 +7,7 @@
    10.4  MAINTAINER="pascal.bellard@slitaz.org"
    10.5  LICENSE="GPL3"
    10.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
    10.7 -WEB_SITE="https://samba.org/"
    10.8 +WEB_SITE="https://www.samba.org/"
    10.9  WGET_URL="${WEB_SITE}$PACKAGE/ftp/stable/$TARBALL"
   10.10  TAZPANEL_DAEMON="man|edit::/etc/samba/smb.conf|web::$WEB_SITE"
   10.11  SUGGESTED="gamin cups perl"