# HG changeset patch # User Pascal Bellard # Date 1595666716 0 # Node ID 78bc4b109dd62f6789d3aba269abafea1f1bd376 # Parent 0bc71e3938135c2ecc84a6bf14e0211888244317 Add coturn diff -r 0bc71e393813 -r 78bc4b109dd6 coturn-dev/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/coturn-dev/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -0,0 +1,20 @@ +# SliTaz package receipt. + +PACKAGE="coturn-dev" +VERSION="4.5.1.3" +CATEGORY="development" +SHORT_DESC="Free open source implementation of TURN and STUN Server, development files" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="BSD" +WEB_SITE="https://github.com/coturn/coturn" +WANTED="coturn" + +DEPENDS="coturn" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib + cp -a $install/usr/include $fs/usr + cp -a $install/usr/lib/*a $fs/usr/lib +} diff -r 0bc71e393813 -r 78bc4b109dd6 coturn/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/coturn/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -0,0 +1,37 @@ +# SliTaz package receipt. + +PACKAGE="coturn" +VERSION="4.5.1.3" +CATEGORY="network" +SHORT_DESC="Free open source implementation of TURN and STUN Server" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="BSD" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WEB_SITE="https://github.com/coturn/coturn" +WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz" +TAGS="stun turn" + +DEPENDS="libssl libsqlite zlib" +BUILD_DEPENDS="openssl-dev sqlite-dev zlib-dev" + +# Rules to configure and make the package. +compile_rules() +{ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + $CONFIGURE_ARGS && + make && + make DESTDIR=$DESTDIR install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/share + cp -a $install/etc $fs + cp -a $install/var $fs + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/share/examples $fs/usr/share + cp -a $install/usr/share/turnserver $fs/usr/share +} diff -r 0bc71e393813 -r 78bc4b109dd6 grub/stuff/example-menu.lst --- a/grub/stuff/example-menu.lst Fri Jul 24 11:12:22 2020 +0100 +++ b/grub/stuff/example-menu.lst Sat Jul 25 08:45:16 2020 +0000 @@ -13,7 +13,7 @@ # For booting SliTaz from a cdrom (LiveCD). # #title SliTaz GNU/Linux (Cooking) (Kernel 2.6.22.9) -#kernel /boot/bzImage vga=771 +#kernel /boot/bzImage root=/dev/null vga=771 #initrd /boot/rootfs.gz # For booting SliTaz from hda1. diff -r 0bc71e393813 -r 78bc4b109dd6 grub2/stuff/example-grub.cfg --- a/grub2/stuff/example-grub.cfg Fri Jul 24 11:12:22 2020 +0100 +++ b/grub2/stuff/example-grub.cfg Sat Jul 25 08:45:16 2020 +0000 @@ -14,7 +14,7 @@ # For booting SliTaz from a cdrom (LiveCD). # #menuentry "SliTaz GNU/Linux (Cooking)" { -# linux /boot/bzImage vga=771 +# linux /boot/bzImage root=/dev/null vga=771 # initrd /boot/rootfs.gz #} diff -r 0bc71e393813 -r 78bc4b109dd6 grub4dos/stuff/menu.lst --- a/grub4dos/stuff/menu.lst Fri Jul 24 11:12:22 2020 +0100 +++ b/grub4dos/stuff/menu.lst Sat Jul 25 08:45:16 2020 +0000 @@ -23,7 +23,7 @@ title Slitaz Frugal find --set-root --ignore-floppies /boot/rootfs.gz - kernel /boot/bzImage vga=normal + kernel /boot/bzImage root=/dev/null vga=normal initrd /boot/rootfs.gz title Windows NT/2K/XP diff -r 0bc71e393813 -r 78bc4b109dd6 ipxe/receipt --- a/ipxe/receipt Fri Jul 24 11:12:22 2020 +0100 +++ b/ipxe/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -21,15 +21,16 @@ sed -i 's/-llzma/& -lpthread/' Makefile.* sed -i 's|//\(#define.*CONSOLE_FRAMEBUFFER\)|\1|' config/console.h sed -i 's|//\(#define.*CONSOLE_SERIAL\)|\1|' config/console.h - sed -i -e 's|//\(#define.*IMAGE_PNG\)|\1|' \ + sed -e 's|//\(#define.*IMAGE_PNG\)|\1|' \ -e 's|.*\(NET_PROTO_IPV6\)|#define \1|' \ -e 's|undef \(DOWNLOAD_PROTO_HTTPS\)|define \1|' \ -e 's|.*\(VLAN_CMD\)|#define \1|' \ -e 's|.*\(CERT_CMD\)|#define \1|' \ -e 's|//\(#define.*CONSOLE_CMD\)|\1|' \ - -e 's|//\(#define.*REBOOT_CMD\)|\1|' config/general.h + -e 's|//\(#define.*REBOOT_CMD\)|\1|' -i config/general.h sed -i "s|\(TAG_LINE \"\)|\1${VERSION#*-} -- |" config/branding.h - sed -i 's|//\(#define.*CPUID_SETTINGS\)|\1|' config/settings.h + sed -e 's|//\(#define.*CPUID_SETTINGS\)|\1|' \ + -e 's|//\(#define.*MEMMAP_SETTINGS\)|\1|' -i config/settings.h pxelinux="$(ls $WOK/syslinux/source/*/core/pxelinux.0)" make bin/undionly.kkkpxe EMBED=$stuff/ipxelinux.ipxe,$pxelinux && mv bin/undionly.kkkpxe bin/ipxelinux.0 @@ -38,7 +39,7 @@ make bin/undionly.pxe bin/undionly.kpxe bin/undionly.kkpxe \ bin/undionly.kkkpxe bin/ipxe.pxe bin/ipxe.kpxe bin/ipxe.kkpxe \ bin/ipxe.kkkpxe bin/ipxe.nbi bin/ipxe.lkrn bin-i386-efi/ipxe.efi \ - bin-i386-efi/snponly.efi bin/ipxe.exe EMBED=$stuff/ipxe.cmd + bin-i386-efi/snponly.efi bin/ipxe.exe EMBED=$stuff/ipxeads.cmd cp $stuff/bootloader.S . cc -o bootloader.o -Wa,-a=bootloader.lst -c bootloader.S objcopy -O binary bootloader.o bootloader.bin diff -r 0bc71e393813 -r 78bc4b109dd6 linld/stuff/linld.txt --- a/linld/stuff/linld.txt Fri Jul 24 11:12:22 2020 +0100 +++ b/linld/stuff/linld.txt Sat Jul 25 08:45:16 2020 +0000 @@ -54,6 +54,6 @@ > linld @args.cmd The -f and -b are useful skip XMM (max 64M ?) and VCPI (max 32M ?) limits: -> linld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "cl=video=-32" +> linld -f -b 64m initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz "cl=root=/dev/null video=-32" Image/zImage support. diff -r 0bc71e393813 -r 78bc4b109dd6 linld/stuff/load.u --- a/linld/stuff/load.u Fri Jul 24 11:12:22 2020 +0100 +++ b/linld/stuff/load.u Sat Jul 25 08:45:16 2020 +0000 @@ -52,7 +52,7 @@ +#if 0 + NL NL "Example" NL + "\tcopy/b rootfs4.gz+rootfs3.gz+rootfs2.gz+rootfs1.gz rootfs.gz" NL -+ "\tlinld initrd=rootfs.gz \"cl=video=-32\"" ++ "\tlinld initrd=rootfs.gz \"cl=root=/dev/null video=-32\"" +#endif ); } diff -r 0bc71e393813 -r 78bc4b109dd6 linld/stuff/src/LINLD.CPP --- a/linld/stuff/src/LINLD.CPP Fri Jul 24 11:12:22 2020 +0100 +++ b/linld/stuff/src/LINLD.CPP Sat Jul 25 08:45:16 2020 +0000 @@ -38,7 +38,7 @@ NL NL "Examples:" NL "\tLINLD -f -b 64m " "initrd=rootfs4.gz,rootfs3.gz,rootfs2.gz,rootfs1.gz " - "\"cl=video=-32\"" + "\"cl=root=/dev/null video=-32\"" NL NL "\tLINLD image=memtest" #endif ); diff -r 0bc71e393813 -r 78bc4b109dd6 linld/stuff/src/TAZBOOT.CPP --- a/linld/stuff/src/TAZBOOT.CPP Fri Jul 24 11:12:22 2020 +0100 +++ b/linld/stuff/src/TAZBOOT.CPP Sat Jul 25 08:45:16 2020 +0000 @@ -156,7 +156,7 @@ bootfrom=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz,\\slitaz\\extrafs.gz\n\ - vga=normal autologin\n\n\ + root=/dev/null vga=normal autologin\n\n\ kernel=\\slitaz\\elks\n\ root=/dev/bda1 ro\n"); } diff -r 0bc71e393813 -r 78bc4b109dd6 linux-uml/receipt --- a/linux-uml/receipt Fri Jul 24 11:12:22 2020 +0100 +++ b/linux-uml/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -97,7 +97,7 @@ # /etc/inittab: "tty21::respawn:/bin/su -c '/boot/vm-uml 1 /boot/guests/slitaz.img 2 512m' nobody" n=\${1:-0} tap=tap\$n -args="" +args="root=/dev/null" dev="initrd=\$(ls -r /boot/rootfs*.gz | sed q)" if [ -n "\$2" ]; then args="ro root=620\${3:-1} screen=text sound=noconf" diff -r 0bc71e393813 -r 78bc4b109dd6 muparser-dev/receipt --- a/muparser-dev/receipt Fri Jul 24 11:12:22 2020 +0100 +++ b/muparser-dev/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="A fast mathematical expression parser library - development files." MAINTAINER="devl547@gmail.com" LICENSE="MIT" -WEB_SITE="https://beltoforion.de/article.php?a=muparser" +WEB_SITE="https://beltoforion.de/en/muparser" DEPENDS="pkg-config" WANTED="muparser" diff -r 0bc71e393813 -r 78bc4b109dd6 muparser/receipt --- a/muparser/receipt Fri Jul 24 11:12:22 2020 +0100 +++ b/muparser/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -6,7 +6,7 @@ SHORT_DESC="A fast mathematical expression parser library." MAINTAINER="devl547@gmail.com" LICENSE="MIT" -WEB_SITE="https://beltoforion.de/article.php?a=muparser" +WEB_SITE="https://beltoforion.de/en/muparser" TARBALL="$PACKAGE-$VERSION.tar.gz" WGET_URL="https://github.com/beltoforion/$PACKAGE/archive/v$VERSION.tar.gz" diff -r 0bc71e393813 -r 78bc4b109dd6 ptlib/receipt --- a/ptlib/receipt Fri Jul 24 11:12:22 2020 +0100 +++ b/ptlib/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -19,6 +19,8 @@ # Rules to configure and make the package. compile_rules() { +patch -p1 < $stuff/ptlib-2.10.10-mga-bison-parameter.patch +sed -i 's|.(Q_LD).*|echo &\n\t&|' make/lib.mak ./configure \ --prefix=/usr \ --bindir=/bin \ diff -r 0bc71e393813 -r 78bc4b109dd6 slitaz-boot-scripts/receipt --- a/slitaz-boot-scripts/receipt Fri Jul 24 11:12:22 2020 +0100 +++ b/slitaz-boot-scripts/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="slitaz-boot-scripts" -VERSION="463" +VERSION="464" CATEGORY="base-system" SHORT_DESC="Provide all the initialisation scripts used at boot time." MAINTAINER="pankso@slitaz.org" diff -r 0bc71e393813 -r 78bc4b109dd6 syslinux/stuff/iso2exe/boot.c --- a/syslinux/stuff/iso2exe/boot.c Fri Jul 24 11:12:22 2020 +0100 +++ b/syslinux/stuff/iso2exe/boot.c Sat Jul 25 08:45:16 2020 +0000 @@ -16,7 +16,7 @@ bootfrom=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz,\\slitaz\\extrafs.gz\n\ - vga=normal autologin\n\n\ + root=/dev/null vga=normal autologin\n\n\ kernel=\\slitaz\\elks\n\ root=/dev/bda1 ro\n",iso,iso,iso); exit(1); @@ -61,7 +61,7 @@ if (magic > 0) { char *initrd = fallback; - fmt = "bootfrom=%s%s magic=%lu mode=%s autologin"; + fmt = "root=/dev/null bootfrom=%s%s magic=%lu mode=%s autologin"; if (rootfs[0]) { initrd = rootfs; if (rootfs[6] != '.' && !isoopen("rootfs.gz")) diff -r 0bc71e393813 -r 78bc4b109dd6 syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Fri Jul 24 11:12:22 2020 +0100 +++ b/syslinux/stuff/iso2exe/taziso Sat Jul 25 08:45:16 2020 +0000 @@ -275,7 +275,7 @@ unix2dos > $mnt/slitaz/boot/tazboot.cmd < $mnt/slitaz/boot/slitaz.pif begin-base64 644 - @@ -325,7 +325,7 @@ echo -en "\nUpdate /boot/grub/menu.lst..." cat >> $mnt/boot/grub/menu.lst < initrd$$ - cmdline="autologin lang=$LANG" + cmdline="root=/dev/null autologin lang=$LANG" [ -s /etc/keymap.conf ] && cmdline="$cmdline kmap=$(cat /etc/keymap.conf)" [ -s /etc/TZ ] && cmdline="$cmdline tz=$(cat /etc/TZ)" rm -f cmdline initrd 2> /dev/null @@ -641,7 +641,7 @@ Examples for tazboot.cmd:\n\n\ image=boot/bzImage\n\ initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\ - autologin\n\n\ + root=/dev/null autologin\n\n\ image=\\slitaz\\vmlinuz root=/dev/sda5 ro\n" 0 0 [ $? -eq 0 ] || return fi diff -r 0bc71e393813 -r 78bc4b109dd6 syslinux/stuff/isolinux.cfg --- a/syslinux/stuff/isolinux.cfg Fri Jul 24 11:12:22 2020 +0100 +++ b/syslinux/stuff/isolinux.cfg Sat Jul 25 08:45:16 2020 +0000 @@ -25,7 +25,7 @@ LABEL slitaz MENU LABEL SliTaz Live COM32 c32box.c32 - APPEND linux /boot/bzImage initrd=/boot/rootfs.gz video=-32 autologin + APPEND linux /boot/bzImage initrd=/boot/rootfs.gz root=/dev/null video=-32 autologin LABEL help MENU LABEL Help & Options diff -r 0bc71e393813 -r 78bc4b109dd6 webalizer/receipt --- a/webalizer/receipt Fri Jul 24 11:12:22 2020 +0100 +++ b/webalizer/receipt Sat Jul 25 08:45:16 2020 +0000 @@ -7,7 +7,7 @@ SHORT_DESC="Web server log file analysis program." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" -WEB_SITE="http://www.webalizer.org/" +WEB_SITE="https://www.patrickfrei.ch/webalizer/" TARBALL="$PACKAGE-${VERSION%.*}-${VERSION##*.}-src.tar.bz2" WGET_URL="ftp://ftp.mrunix.net/pub/$PACKAGE/$TARBALL"