# HG changeset patch # User Pascal Bellard # Date 1680539742 0 # Node ID f40d97a52c429e02e65e409a3f239a4854001c86 # Parent 93d377d13ba017b67bc92fcaf12c57b0f24c7412 Add apachetop & mysqlsniffer diff -r 93d377d13ba0 -r f40d97a52c42 BootProg/stuff/boot16.asm --- a/BootProg/stuff/boot16.asm Mon Apr 03 06:53:23 2023 +0100 +++ b/BootProg/stuff/boot16.asm Mon Apr 03 16:35:42 2023 +0000 @@ -89,7 +89,7 @@ LBAsupport equ 1 ; +16 bytes Over2GB equ 1 ; +5 bytes GeometryCheck equ 1 ; +18 bytes -SectorOf512Bytes equ 1 ; -4/-6 bytes +SectorOf512Bytes equ 0 ; -4/-6 bytes CheckAttrib equ 0 ; +6 bytes [BITS 16] @@ -323,7 +323,7 @@ FAT12 equ 1 FAT16 equ 1 -TINYFAT16 equ 1 +TINYFAT16 equ 1 ; < 4072 clusters fat16 support push di ; up to 2 * 635K / BytesPerCluster = 2540 bytes %if FAT12 == 1 mov cl, 12 @@ -339,7 +339,7 @@ %if FAT12 == 1 mov dx, 0FFF6h %if TINYFAT16 == 1 - test [bx(bsFileSystem+4)], cl ; FAT12 or FAT16 ? clear C + test [bx(bsFileSystem+4)], cl ; FAT12 or FAT16 ? clear C (bit 2) jne ReadClusterFat16 %else cmp [bx(bpbSectorsPerFAT)], cx ; 1..12 = FAT12, 16..256 = FAT16 diff -r 93d377d13ba0 -r f40d97a52c42 BootProg/stuff/boot32.asm --- a/BootProg/stuff/boot32.asm Mon Apr 03 06:53:23 2023 +0100 +++ b/BootProg/stuff/boot32.asm Mon Apr 03 16:35:42 2023 +0000 @@ -497,7 +497,6 @@ ;; Input: EAX = LBA ;; ;; CX = sector count ;; ;; ES:BX -> buffer address ;; -;; Output: CF = 0 if no more sectors ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ReadSectorLBA: diff -r 93d377d13ba0 -r f40d97a52c42 BootProg/stuff/bootex.asm --- a/BootProg/stuff/bootex.asm Mon Apr 03 06:53:23 2023 +0100 +++ b/BootProg/stuff/bootex.asm Mon Apr 03 16:35:42 2023 +0000 @@ -80,8 +80,8 @@ %define si(label) si+label-boot NullEntryCheck equ 1 ; +3 bytes ReadRetry equ 1 ; +8 bytes -SectorOf512Bytes equ 1 ; -13 bytes -CheckAttrib equ 0 ; +19 bytes +SectorOf512Bytes equ 0 ; -11 bytes +CheckAttrib equ 0 ; +18 bytes [BITS 16] [CPU 386] @@ -210,7 +210,7 @@ cmp byte [es:di], 85h ; EXFAT_ENTRY_FILE ? jne NotEntryFile mov al, [es:di+Attributes] - mov [bx+32], al + mov [ProgramName+NameLength+1], al NotEntryFile: %endif %if NullEntryCheck != 0 @@ -246,7 +246,7 @@ VolumeLabel equ 8 SubDirectory equ 10h jnz SkipFindName - test byte [bx+32], VolumeLabel+SubDirectory + test byte [si], VolumeLabel+SubDirectory SkipFindName: %endif je FindNameFound ; cx = 0 @@ -267,6 +267,8 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Load the entire file ;; +;; Input: ESI = cluster ;; +;; CX = 0 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;; push es @@ -396,15 +398,15 @@ ;; Reads a exFAT cluster ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Input: EDX:EAX = LBA ;; -;; EBX = 0 ;; ;; CX = sector cnt ;; ;; ESI = cluster no ;; ;; ES:0 -> buffer adrs ;; -;; Output: EBX = 0 ;; -;; CX = next cnt ;; +;; Output: EDX:EAX = next LBA ;; +;; CX = sector cnt ;; +;; ESI = cluster no ;; ;; EBP = bytes/sector;; -;; ES:0 -> next adrs ;; -;; C=0 for last sector ;; +;; Keep: EDI = 0 ;; +;; EBX = 0 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ReadCluster: @@ -417,9 +419,9 @@ %if SectorOf512Bytes != 0 mov al, 128 %else - mov cl, -2 - add cl, [bx(bpbSectorSizeBits)] - bts ax, cx ; eax=# of exFAT entries per sector + mov ah, 40h + mov cx, [bx(bpbSectorSizeBits)] + rol ax, cl ; eax=# of exFAT entries per sector %endif lea edi, [esi-2] ; edi=cluster #-2 xchg eax, esi @@ -433,7 +435,11 @@ mov esi, [es:si] ; esi=next cluster # +%if SectorOf512Bytes != 0 mov dl, [bx(bpbSectorPerClusterBits)] +%else + mov dl, ch +%endif xor ecx, ecx bts ecx, edx ; 10000h max (32MB cluster) xchg eax, edi ; get cluster #-2 @@ -449,13 +455,12 @@ ;; Reads a sector using BIOS Int 13h ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Input: EDX:EAX = LBA ;; -;; BX = 0 ;; -;; CX = sector count ;; ;; ES:0 -> buffer address ;; -;; Output: BX = 0 ;; -;; CX = next count ;; -;; EBP = bytes/sector ;; -;; ES:0 -> next address ;; +;; Output: EBP = bytes/sector ;; +;; Keep: ESI = cluster ;; +;; EDI = FAT sector or 0 ;; +;; ECX = sector count ;; +;; EBX = 0 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; %if SectorOf512Bytes != 0 diff -r 93d377d13ba0 -r f40d97a52c42 apachetop/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/apachetop/receipt Mon Apr 03 16:35:42 2023 +0000 @@ -0,0 +1,38 @@ +# SliTaz package receipt. + +PACKAGE="apachetop" +VERSION="0.23.2" +CATEGORY="network" +SHORT_DESC="Watches a logfile generated by Apache" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="BSD" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WEB_SITE="https://github.com/tessus/apachetop" +WGET_URL="$WEB_SITE/archive/refs/tags/$VERSION.tar.gz" + +DEPENDS="gamin pcre2 readline ncurses" +BUILD_DEPENDS="gamin-dev pcre2-dev readline-dev ncurses-dev automake libtool" + +# What is the latest version available today? +current_version() +{ + wget -O - ${WGET_URL%/arch*}/releases 2>/dev/null | \ + sed '/archive.*tar/!d;s|.*/v*\(.*\).tar.*|\1|;q' +} + +# Rules to configure and make the package. +compile_rules() +{ + ./autogen.sh + ./configure && + make && + make install + make DESTDIR=$DESTDIR install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr + cp -a $install/usr/bin $fs/usr/ +} diff -r 93d377d13ba0 -r f40d97a52c42 libnsl-dev/receipt --- a/libnsl-dev/receipt Mon Apr 03 06:53:23 2023 +0100 +++ b/libnsl-dev/receipt Mon Apr 03 16:35:42 2023 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="Public client interface library for NIS(YP) and NIS+ - development files." MAINTAINER="maintainer@slitaz.org" LICENSE="LGPL2+" -WEB_SITE="https://www.thkukuk.de/nis/" +WEB_SITE="https://github.com/thkukuk/libnsl/" DEPENDS="libnsl" WANTED="libnsl" diff -r 93d377d13ba0 -r f40d97a52c42 libnsl/receipt --- a/libnsl/receipt Mon Apr 03 06:53:23 2023 +0100 +++ b/libnsl/receipt Mon Apr 03 16:35:42 2023 +0000 @@ -6,10 +6,10 @@ SHORT_DESC="Public client interface library for NIS(YP) and NIS+." MAINTAINER="maintainer@slitaz.org" LICENSE="LGPL2+" -WEB_SITE="https://www.thkukuk.de/nis/" +WEB_SITE="https://github.com/thkukuk/libnsl/" TARBALL="$PACKAGE-$VERSION.tar.xz" -WGET_URL="https://github.com/thkukuk/$PACKAGE/releases/download/v$VERSION/$TARBALL" +WGET_URL="https://github.com/thkukuk/libnsl/releases/download/v$VERSION/$TARBALL" # What is the latest version available today? current_version() diff -r 93d377d13ba0 -r f40d97a52c42 mysqlsniffer/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mysqlsniffer/receipt Mon Apr 03 16:35:42 2023 +0000 @@ -0,0 +1,37 @@ +# SliTaz package receipt. + +PACKAGE="mysqlsniffer" +GITHASH="37410e18bc8a407be59a19a0cbf10c8ab4469fa2" +VERSION="2021" +CATEGORY="network" +SHORT_DESC="Watch MySQL traffic on a TCP/IP network" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL3" +TARBALL="$PACKAGE-$VERSION.zip" +WEB_SITE="https://github.com/daniel-nichter/hackmysql.com/" +WGET_URL="$WEB_SITE/archive/$GITHASH.zip" + +DEPENDS="libpcap" +BUILD_DEPENDS="libpcap-dev" + +# What is the latest version available today? +current_version() +{ + wget -O - $WEB_SITE/commits/master 2>/dev/null | \ + sed '/Commits on/!d;s|.*on |"|;s|<.*|"|;q' | xargs date +%Y -d +} + +# Rules to configure and make the package. +compile_rules() +{ + cd mysqlsniffer + gcc -O2 -lpcap -o mysqlsniffer mysqlsniffer.c packet_handlers.c misc.c +} + + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin + cp -a $src/mysqlsniffer/mysqlsniffer $fs/usr/bin +} diff -r 93d377d13ba0 -r f40d97a52c42 pyroom/receipt --- a/pyroom/receipt Mon Apr 03 06:53:23 2023 +0100 +++ b/pyroom/receipt Mon Apr 03 16:35:42 2023 +0000 @@ -7,7 +7,7 @@ MAINTAINER="paul@slitaz.org" LICENSE="GPL3" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://pyroom.org/" +WEB_SITE="https://launchpad.net/pyroom/" WGET_URL="https://launchpad.net/pyroom/${VERSION%.*}/$VERSION/+download/$TARBALL" DEPENDS="python pygtk python-xdg libffi" @@ -16,7 +16,7 @@ # What is the latest version available today? current_version() { - wget -O - $WEB_SITE 2>/dev/null | \ + wget -O - http://pyroom.org/ 2>/dev/null | \ sed '/PyRoom [0-9]/!d;s|.*Room ||;s| released.*||;q' } diff -r 93d377d13ba0 -r f40d97a52c42 samba-pam/receipt --- a/samba-pam/receipt Mon Apr 03 06:53:23 2023 +0100 +++ b/samba-pam/receipt Mon Apr 03 16:35:42 2023 +0000 @@ -8,7 +8,7 @@ LICENSE="GPL3" SOURCE="samba" TARBALL="$SOURCE-$VERSION.tar.gz" -WEB_SITE="https://samba.org/" +WEB_SITE="https://www.samba.org/" WGET_URL="${WEB_SITE}$SOURCE/ftp/stable/$TARBALL" TAZPANEL_DAEMON="man::samba|edit::/etc/samba/smb.conf|web::$WEB_SITE" SUGGESTED="gamin" diff -r 93d377d13ba0 -r f40d97a52c42 samba/receipt --- a/samba/receipt Mon Apr 03 06:53:23 2023 +0100 +++ b/samba/receipt Mon Apr 03 16:35:42 2023 +0000 @@ -7,7 +7,7 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL3" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="https://samba.org/" +WEB_SITE="https://www.samba.org/" WGET_URL="${WEB_SITE}$PACKAGE/ftp/stable/$TARBALL" TAZPANEL_DAEMON="man|edit::/etc/samba/smb.conf|web::$WEB_SITE" SUGGESTED="gamin cups perl"