wok-next rev 19863
Up eudev, make-slitaz-icons, ntfs-3g, pcmanfm, polkit, slitaz-base-files, slitaz-boot-scripts, slitaz-icons-paper.
line diff
1.1 --- a/eudev/receipt Fri Sep 08 15:20:22 2017 +0300 1.2 +++ b/eudev/receipt Tue Sep 12 01:34:11 2017 +0300 1.3 @@ -7,6 +7,7 @@ 1.4 MAINTAINER="tcg.thegamer@gmail.com" 1.5 LICENSE="GPL2" 1.6 WEB_SITE="http://dev.gentoo.org/~blueness/eudev/" 1.7 +LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/eudev.html" 1.8 PROVIDE="udev" 1.9 1.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.11 @@ -42,9 +43,10 @@ 1.12 make && 1.13 make install 1.14 1.15 - mkdir -p $install/etc/udev 1.16 - cp $stuff/udev.conf $install/etc/udev 1.17 cp $stuff/*.rules $install/etc/udev/rules.d 1.18 + cp $stuff/udev/* $install/lib/udev 1.19 + 1.20 + mkdir -p "$install/lib/firmware" 1.21 1.22 # https://docs.oracle.com/cd/E37670_01/E41138/html/ch07s03.html 1.23 # /lib/udev/rules.d : default rules files. Do not edit these files. 1.24 @@ -67,10 +69,7 @@ 1.25 esac 1.26 } 1.27 1.28 -post_install_eudev() 1.29 -{ 1.30 - mkdir -p "$1/lib/firmware" 1.31 - 1.32 +post_install_eudev() { 1.33 # Create some devices and directories that Udev cannot handle 1.34 # due to them being required very early in the boot process 1.35 mkdir -p "$1/lib/udev/devices/pts" 1.36 @@ -80,13 +79,13 @@ 1.37 # Sanity check for udev+ldap boot 1.38 grep GROUP "$1"/etc/udev/rules.d/* "$1"/lib/udev/rules.d/* 2>/dev/null | \ 1.39 sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq | \ 1.40 - while read x ; do 1.41 + while read x; do 1.42 grep -q ^$x: "$1/etc/group" || chroot "$1/" addgroup -S $x 1.43 done 1.44 1.45 grep OWNER "$1"/etc/udev/rules.d/* "$1"/lib/udev/rules.d/* 2>/dev/null | \ 1.46 sed 's/.*OWNER="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq | \ 1.47 - while read x ; do 1.48 + while read x; do 1.49 grep -q ^$x: "$1/etc/passwd" || chroot "$1/" adduser -S -D -H $x 1.50 done 1.51 }
2.1 --- a/eudev/stuff/40-alsa.rules Fri Sep 08 15:20:22 2017 +0300 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,10 +0,0 @@ 2.4 -# do not edit this file, it will be overwritten on update 2.5 - 2.6 -SUBSYSTEM=="sound", GROUP="audio" 2.7 -KERNEL=="controlC[0-9]*", NAME="snd/%k" 2.8 -KERNEL=="hwC[D0-9]*", NAME="snd/%k" 2.9 -KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" 2.10 -KERNEL=="midiC[D0-9]*", NAME="snd/%k" 2.11 -KERNEL=="timer", NAME="snd/%k" 2.12 -KERNEL=="seq", NAME="snd/%k" 2.13 -KERNEL=="mixer0", SYMLINK+="mixer"
3.1 --- a/eudev/stuff/45-usb.rules Fri Sep 08 15:20:22 2017 +0300 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,3 +0,0 @@ 3.4 -# usb devices 3.5 -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE:="0666" 3.6 -SUBSYSTEM=="usb_device",MODE:="0666"
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/eudev/stuff/55-lfs.rules Tue Sep 12 01:34:11 2017 +0300 4.3 @@ -0,0 +1,14 @@ 4.4 +# /etc/udev/rules.d/55-lfs.rules: Rule definitions for LFS. 4.5 + 4.6 +# Core kernel devices 4.7 + 4.8 +# This causes the system clock to be set as soon as /dev/rtc becomes available. 4.9 +#SUBSYSTEM=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start" 4.10 +#KERNEL=="rtc", ACTION=="add", MODE="0644", RUN+="/etc/rc.d/init.d/setclock start" 4.11 + 4.12 +# Comms devices 4.13 + 4.14 +KERNEL=="ippp[0-9]*", GROUP="dialout" 4.15 +KERNEL=="isdn[0-9]*", GROUP="dialout" 4.16 +KERNEL=="isdnctrl[0-9]*", GROUP="dialout" 4.17 +KERNEL=="dcbri[0-9]*", GROUP="dialout"
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/eudev/stuff/81-cdrom.rules Tue Sep 12 01:34:11 2017 +0300 5.3 @@ -0,0 +1,3 @@ 5.4 +# /etc/udev/rules.d/81-cdrom.rules: Set CD-ROM permissions and get device capabilities 5.5 + 5.6 +ACTION=="add", SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", IMPORT{program}="cdrom_id --export $tempnode", GROUP="cdrom"
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/eudev/stuff/83-cdrom-symlinks.rules Tue Sep 12 01:34:11 2017 +0300 6.3 @@ -0,0 +1,13 @@ 6.4 +# /etc/udev/rules.d/83-cdrom-symlinks.rules: Determine CD drive capability. 6.5 + 6.6 +ACTION!="add", GOTO="cd_aliases_generator_end" 6.7 +SUBSYSTEM!="block", GOTO="cd_aliases_generator_end" 6.8 +ENV{GENERATED}=="?*", GOTO="cd_aliases_generator_end" 6.9 + 6.10 +# Fail the uevent if the autogenerated rules cannot be saved 6.11 +ENV{ID_CDROM}=="?*", PROGRAM="/bin/grep -c ' / [^[:space:]]* rw' /proc/mounts", \ 6.12 + RESULT!="2", RUN+="/bin/false", GOTO="cd_aliases_generator_end" 6.13 + 6.14 +ENV{ID_CDROM}=="?*", PROGRAM="write_cd_rules", SYMLINK+="%c" 6.15 + 6.16 +LABEL="cd_aliases_generator_end"
7.1 --- a/eudev/stuff/90-permissions.rules Fri Sep 08 15:20:22 2017 +0300 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,12 +0,0 @@ 7.4 - 7.5 -# sound devices 7.6 -SUBSYSTEM=="sound",GROUP="audio" 7.7 -SUBSYSTEM=="sound",MODE="0664" 7.8 - 7.9 -# storage 7.10 -SUBSYSTEM=="ide",GROUP="root" 7.11 -SUBSYSTEM=="ide",MODE="0660" 7.12 -SUBSYSTEM=="ata",GROUP="root" 7.13 -SUBSYSTEM=="ata",MODE="0660" 7.14 -SUBSYSTEM=="scsi",GROUP="root" 7.15 -SUBSYSTEM=="scsi",MODE="0660"
8.1 --- a/eudev/stuff/92-hal.rules Fri Sep 08 15:20:22 2017 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,2 +0,0 @@ 8.4 -# pass all events to hal daemon 8.5 -#RUN+="socket:@/org/freedesktop/hal/udev_event"
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/eudev/stuff/oldstuff/40-alsa.rules Tue Sep 12 01:34:11 2017 +0300 9.3 @@ -0,0 +1,10 @@ 9.4 +# do not edit this file, it will be overwritten on update 9.5 + 9.6 +SUBSYSTEM=="sound", GROUP="audio" 9.7 +KERNEL=="controlC[0-9]*", NAME="snd/%k" 9.8 +KERNEL=="hwC[D0-9]*", NAME="snd/%k" 9.9 +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" 9.10 +KERNEL=="midiC[D0-9]*", NAME="snd/%k" 9.11 +KERNEL=="timer", NAME="snd/%k" 9.12 +KERNEL=="seq", NAME="snd/%k" 9.13 +KERNEL=="mixer0", SYMLINK+="mixer"
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/eudev/stuff/oldstuff/45-usb.rules Tue Sep 12 01:34:11 2017 +0300 10.3 @@ -0,0 +1,3 @@ 10.4 +# usb devices 10.5 +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE:="0666" 10.6 +SUBSYSTEM=="usb_device",MODE:="0666"
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/eudev/stuff/oldstuff/90-permissions.rules Tue Sep 12 01:34:11 2017 +0300 11.3 @@ -0,0 +1,12 @@ 11.4 + 11.5 +# sound devices 11.6 +SUBSYSTEM=="sound",GROUP="audio" 11.7 +SUBSYSTEM=="sound",MODE="0664" 11.8 + 11.9 +# storage 11.10 +SUBSYSTEM=="ide",GROUP="root" 11.11 +SUBSYSTEM=="ide",MODE="0660" 11.12 +SUBSYSTEM=="ata",GROUP="root" 11.13 +SUBSYSTEM=="ata",MODE="0660" 11.14 +SUBSYSTEM=="scsi",GROUP="root" 11.15 +SUBSYSTEM=="scsi",MODE="0660"
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/eudev/stuff/oldstuff/92-hal.rules Tue Sep 12 01:34:11 2017 +0300 12.3 @@ -0,0 +1,2 @@ 12.4 +# pass all events to hal daemon 12.5 +#RUN+="socket:@/org/freedesktop/hal/udev_event"
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/eudev/stuff/oldstuff/udev.conf Tue Sep 12 01:34:11 2017 +0300 13.3 @@ -0,0 +1,29 @@ 13.4 +# /etc/udev/udev.conf - The main config file for udev 13.5 +# 13.6 +# This file can be used to override some of udev's default values 13.7 +# for where it looks for files, and where it places device nodes. 13.8 + 13.9 + 13.10 +# udev_root - where in the filesystem to place the device nodes 13.11 +udev_root="/dev/" 13.12 + 13.13 +# udev_db - The name and location of the udev database. 13.14 +#udev_db="/run/udev/tdb" 13.15 + 13.16 +# udev_rules - The name and location of the udev rules dir 13.17 +udev_rules="/etc/udev/rules.d" 13.18 + 13.19 +# default_mode - set the default mode for all nodes that have no 13.20 +# explicit match in the permissions file 13.21 +default_mode="0660" 13.22 + 13.23 +# default_owner - set the default owner for all nodes that have no 13.24 +# explicit match in the permissions file 13.25 +default_owner="root" 13.26 + 13.27 +# default_group - set the default group for all nodes that have no 13.28 +# explicit match in the permissions file 13.29 +default_group="root" 13.30 + 13.31 +# udev_log - set to "yes" if you want logging, else "no" 13.32 +udev_log="err"
14.1 --- a/eudev/stuff/udev.conf Fri Sep 08 15:20:22 2017 +0300 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,29 +0,0 @@ 14.4 -# /etc/udev/udev.conf - The main config file for udev 14.5 -# 14.6 -# This file can be used to override some of udev's default values 14.7 -# for where it looks for files, and where it places device nodes. 14.8 - 14.9 - 14.10 -# udev_root - where in the filesystem to place the device nodes 14.11 -udev_root="/dev/" 14.12 - 14.13 -# udev_db - The name and location of the udev database. 14.14 -#udev_db="/run/udev/tdb" 14.15 - 14.16 -# udev_rules - The name and location of the udev rules dir 14.17 -udev_rules="/etc/udev/rules.d" 14.18 - 14.19 -# default_mode - set the default mode for all nodes that have no 14.20 -# explicit match in the permissions file 14.21 -default_mode="0660" 14.22 - 14.23 -# default_owner - set the default owner for all nodes that have no 14.24 -# explicit match in the permissions file 14.25 -default_owner="root" 14.26 - 14.27 -# default_group - set the default group for all nodes that have no 14.28 -# explicit match in the permissions file 14.29 -default_group="root" 14.30 - 14.31 -# udev_log - set to "yes" if you want logging, else "no" 14.32 -udev_log="err"
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/eudev/stuff/udev/init-net-rules.sh Tue Sep 12 01:34:11 2017 +0300 15.3 @@ -0,0 +1,129 @@ 15.4 +#! /bin/bash 15.5 + 15.6 +# This script generates rules for persistent network device naming 15.7 +# Data from udev-182 75-persistent-net-generator.rules 15.8 +# Updated fof udev-197 (DEVICES=en*) 15.9 + 15.10 +RULES=/etc/udev/rules.d/70-persistent-net.rules 15.11 +DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*}) 15.12 + 15.13 +function usage 15.14 +{ 15.15 + echo $msg 15.16 + echo "init-net-rules.sh is an LFS-specific script to initialize" 15.17 + echo "$RULES" 15.18 + exit 1 15.19 +} 15.20 + 15.21 +declare -A VENDORS_IGNORED 15.22 +VENDORS_IGNORED['52:54:00:']="kvm" 15.23 +VENDORS_IGNORED['00:0c:29:']="vmware" 15.24 +VENDORS_IGNORED['00:50:56:']="vmware" 15.25 +VENDORS_IGNORED['00:15:5d:']="hyper-v" 15.26 +VENDORS_IGNORED['00:00:00:']="invalid" 15.27 + 15.28 +declare -A VENDORS 15.29 +VENDORS['02:07:01:']="Interlan, DEC, etc" 15.30 +VENDORS['02:60:60:']="3com" 15.31 +VENDORS['02:60:8c:']="3Com IBM PC; Imagen. etc" 15.32 +VENDORS['02:a0:c9:']="intel" 15.33 +VENDORS['02:aa:3c:']="Olivetti" 15.34 +VENDORS['02:cf:1f:']="Masscomp, Silicon Graphics, etc" 15.35 +VENDORS['02:e0:3b:']="Gigabit" 15.36 +VENDORS['02:e6:d3:']="BTI" 15.37 +VENDORS['52:54:00:']="Realtek" 15.38 +VENDORS['52:54:4c:']="Novell" 15.39 +VENDORS['52:54:ab:']="Realtek" 15.40 +VENDORS['e2:0c:0f:']="Kingston" 15.41 +VENDORS['00:16:3e:']="Xensource" 15.42 + 15.43 +function ignore_if 15.44 +{ 15.45 + if [[ "${VENDORS_IGNORED[$VENDOR]}" != "" ]]; then return 0; fi 15.46 + if [[ "${VENDORS[$VENDOR]}" != "" ]]; then return 1; fi 15.47 + 15.48 + byte2=$(echo $VENDOR | cut -c2) 15.49 + if echo $byte2 | grep -q "[2367abef]"; then return 0; fi 15.50 + 15.51 + return 1 # Default is to not ignore 15.52 +} 15.53 + 15.54 +function comment 15.55 +{ 15.56 + # Not implemented 15.57 + # SUBSYSTEMS=="pci" 15.58 + # export COMMENT="PCI device $attr{vendor}:$attr{device} ($driver)" 15.59 + 15.60 + # SUBSYSTEMS=="usb", ATTRS{idVendor}=="?*" 15.61 + # export COMMENT="USB device 0x$attr{idVendor}:0x$attr{idProduct} ($driver)" 15.62 + 15.63 + # SUBSYSTEMS=="pcmcia", 15.64 + # export COMMENT="PCMCIA device $attr{card_id}:$attr{manf_id} ($driver)" 15.65 + 15.66 + # SUBSYSTEMS=="ieee1394", 15.67 + # export COMMENT="Firewire device $attr{host_id})" 15.68 + 15.69 + # ibmveth likes to use "locally administered" MAC addresses 15.70 + # DRIVERS=="ibmveth", 15.71 + # export COMMENT="ibmveth ($id)" 15.72 + 15.73 + # S/390 uses id matches only, do not use MAC address match 15.74 + # SUBSYSTEMS=="ccwgroup", 15.75 + # export COMMENT="S/390 $driver device at $id", 15.76 + # export MATCHID="$id" 15.77 + # export MATCHDRV="$driver" 15.78 + # export MATCHADDR="" 15.79 + 15.80 + # Default 15.81 + driver=$(basename $(readlink -f $NIC/device/driver/module)) 15.82 + export COMMENT="net device ${driver}" 15.83 +} 15.84 + 15.85 +if ! mountpoint -q /sys; then 15.86 + msg="/sys mut be mounted" 15.87 + usage 15.88 +fi 15.89 + 15.90 +if ! mountpoint -q /proc; then 15.91 + msg="/proc mut be mounted" 15.92 + usage 15.93 +fi 15.94 + 15.95 +if [ -e $RULES ]; then 15.96 + msg="The rules file already exists" 15.97 + usage 15.98 +fi 15.99 + 15.100 +# Ignore Xen virtual interfaces 15.101 +if [ -e /proc/xen ]; then 15.102 + msg="The rules file should not be created in the Xen environment" 15.103 + usage 15.104 +fi 15.105 + 15.106 +# Variables used to communicate with write_net_rules: 15.107 +# INTERFACE simple interface name 15.108 +# MATCHADDR MAC address used for the match 15.109 +# MATCHID bus_id used for the match 15.110 +# MATCHDRV driver name used for the match 15.111 +# MATCHIFTYPE interface type match 15.112 +# COMMENT comment to add to the generated rule 15.113 +# INTERFACE_NAME requested name supplied by external tool 15.114 +# INTERFACE_NEW new interface name returned by rule writer 15.115 + 15.116 +for NIC in $DEVICES; do 15.117 + IF=${NIC##*/} 15.118 + if echo $NIC | grep -q '*' ; then continue; fi 15.119 + 15.120 + export INTERFACE=${NIC##*/} # Simple interface name 15.121 + export MATCHADDR="$(cat $NIC/address)" # Read MAC address 15.122 + 15.123 + VENDOR=$(echo $MATCHADDR | cut -c-9) 15.124 + if ignore_if; then continue; fi 15.125 + 15.126 + export MATCHDEVID="$(cat $NIC/dev_id)" 15.127 + export MATCHIFTYPE="$(cat $NIC/type)" # Read interface type 15.128 + comment 15.129 + 15.130 + /lib/udev/write_net_rules 15.131 +done 15.132 +
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/eudev/stuff/udev/rule_generator.functions Tue Sep 12 01:34:11 2017 +0300 16.3 @@ -0,0 +1,115 @@ 16.4 +# functions used by the udev rule generator 16.5 + 16.6 +# Copyright (C) 2006 Marco d'Itri <md@Linux.IT> 16.7 +# Updated for LFS by Bruce Dubbs <bdubbs@linuxfromscratch.org> 16.8 +# Hardcoded RUNDIR 16.9 + 16.10 +# This program is free software: you can redistribute it and/or modify 16.11 +# it under the terms of the GNU General Public License as published by 16.12 +# the Free Software Foundation, either version 2 of the License, or 16.13 +# (at your option) any later version. 16.14 + 16.15 +# This program is distributed in the hope that it will be useful, 16.16 +# but WITHOUT ANY WARRANTY; without even the implied warranty of 16.17 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16.18 +# GNU General Public License for more details. 16.19 + 16.20 +# You should have received a copy of the GNU General Public License 16.21 +# along with this program. If not, see <http://www.gnu.org/licenses/>. 16.22 + 16.23 +PATH='/usr/bin:/bin:/usr/sbin:/sbin' 16.24 + 16.25 +# Read a single line from file $1 in the $DEVPATH directory. 16.26 +# The function must not return an error even if the file does not exist. 16.27 +sysread() { 16.28 + local file="$1" 16.29 + [ -e "/sys$DEVPATH/$file" ] || return 0 16.30 + local value 16.31 + read value < "/sys$DEVPATH/$file" || return 0 16.32 + echo "$value" 16.33 +} 16.34 + 16.35 +sysreadlink() { 16.36 + local file="$1" 16.37 + [ -e "/sys$DEVPATH/$file" ] || return 0 16.38 + readlink -f /sys$DEVPATH/$file 2> /dev/null || true 16.39 +} 16.40 + 16.41 +# Return true if a directory is writeable. 16.42 +writeable() { 16.43 + if ln -s test-link $1/.is-writeable 2> /dev/null; then 16.44 + rm -f $1/.is-writeable 16.45 + return 0 16.46 + else 16.47 + return 1 16.48 + fi 16.49 +} 16.50 + 16.51 +# Create a lock file for the current rules file. 16.52 +lock_rules_file() { 16.53 + RUNDIR=/run/udev 16.54 + [ -e "$RUNDIR" ] || return 0 16.55 + 16.56 + RULES_LOCK="$RUNDIR/.lock-${RULES_FILE##*/}" 16.57 + 16.58 + retry=30 16.59 + while ! mkdir $RULES_LOCK 2> /dev/null; do 16.60 + if [ $retry -eq 0 ]; then 16.61 + echo "Cannot lock $RULES_FILE!" >&2 16.62 + exit 2 16.63 + fi 16.64 + sleep 1 16.65 + retry=$(($retry - 1)) 16.66 + done 16.67 +} 16.68 + 16.69 +unlock_rules_file() { 16.70 + [ "$RULES_LOCK" ] || return 0 16.71 + rmdir $RULES_LOCK || true 16.72 +} 16.73 + 16.74 +# Choose the real rules file if it is writeable or a temporary file if not. 16.75 +# Both files should be checked later when looking for existing rules. 16.76 +choose_rules_file() { 16.77 + RUNDIR=/run/udev 16.78 + local tmp_rules_file="$RUNDIR/tmp-rules--${RULES_FILE##*/}" 16.79 + [ -e "$RULES_FILE" -o -e "$tmp_rules_file" ] || PRINT_HEADER=1 16.80 + 16.81 + if writeable ${RULES_FILE%/*}; then 16.82 + RO_RULES_FILE='/dev/null' 16.83 + else 16.84 + RO_RULES_FILE=$RULES_FILE 16.85 + RULES_FILE=$tmp_rules_file 16.86 + fi 16.87 +} 16.88 + 16.89 +# Return the name of the first free device. 16.90 +raw_find_next_available() { 16.91 + local links="$1" 16.92 + 16.93 + local basename=${links%%[ 0-9]*} 16.94 + local max=-1 16.95 + for name in $links; do 16.96 + local num=${name#$basename} 16.97 + [ "$num" ] || num=0 16.98 + [ $num -gt $max ] && max=$num 16.99 + done 16.100 + 16.101 + local max=$(($max + 1)) 16.102 + # "name0" actually is just "name" 16.103 + [ $max -eq 0 ] && return 16.104 + echo "$max" 16.105 +} 16.106 + 16.107 +# Find all rules matching a key (with action) and a pattern. 16.108 +find_all_rules() { 16.109 + local key="$1" 16.110 + local linkre="$2" 16.111 + local match="$3" 16.112 + 16.113 + local search='.*[[:space:],]'"$key"'"('"$linkre"')".*' 16.114 + echo $(sed -n -r -e 's/^#.*//' -e "${match}s/${search}/\1/p" \ 16.115 + $RO_RULES_FILE \ 16.116 + $([ -e $RULES_FILE ] && echo $RULES_FILE) \ 16.117 + 2>/dev/null) 16.118 +}
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/eudev/stuff/udev/write_cd_rules Tue Sep 12 01:34:11 2017 +0300 17.3 @@ -0,0 +1,126 @@ 17.4 +#!/bin/sh -e 17.5 + 17.6 +# This script is run if an optical drive lacks a rule for persistent naming. 17.7 +# 17.8 +# It adds symlinks for optical drives based on the device class determined 17.9 +# by cdrom_id and used ID_PATH to identify the device. 17.10 + 17.11 +# (C) 2006 Marco d'Itri <md@Linux.IT> 17.12 +# 17.13 +# This program is free software: you can redistribute it and/or modify 17.14 +# it under the terms of the GNU General Public License as published by 17.15 +# the Free Software Foundation, either version 2 of the License, or 17.16 +# (at your option) any later version. 17.17 + 17.18 +# This program is distributed in the hope that it will be useful, 17.19 +# but WITHOUT ANY WARRANTY; without even the implied warranty of 17.20 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17.21 +# GNU General Public License for more details. 17.22 + 17.23 +# You should have received a copy of the GNU General Public License 17.24 +# along with this program. If not, see <http://www.gnu.org/licenses/>. 17.25 + 17.26 +# debug, if UDEV_LOG=<debug> 17.27 +if [ -n "$UDEV_LOG" ]; then 17.28 + if [ "$UDEV_LOG" -ge 7 ]; then 17.29 + set -x 17.30 + fi 17.31 +fi 17.32 + 17.33 +RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" 17.34 + 17.35 +. /lib/udev/rule_generator.functions 17.36 + 17.37 +find_next_available() { 17.38 + raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")" 17.39 +} 17.40 + 17.41 +write_rule() { 17.42 + local match="$1" 17.43 + local link="$2" 17.44 + local comment="$3" 17.45 + 17.46 + { 17.47 + if [ "$PRINT_HEADER" ]; then 17.48 + PRINT_HEADER= 17.49 + echo "# This file was automatically generated by the $0" 17.50 + echo "# program, run by the cd-aliases-generator.rules rules file." 17.51 + echo "#" 17.52 + echo "# You can modify it, as long as you keep each rule on a single" 17.53 + echo "# line, and set the \$GENERATED variable." 17.54 + echo "" 17.55 + fi 17.56 + 17.57 + [ "$comment" ] && echo "# $comment" 17.58 + echo "$match, SYMLINK+=\"$link\", ENV{GENERATED}=\"1\"" 17.59 + } >> $RULES_FILE 17.60 + SYMLINKS="$SYMLINKS $link" 17.61 +} 17.62 + 17.63 +if [ -z "$DEVPATH" ]; then 17.64 + echo "Missing \$DEVPATH." >&2 17.65 + exit 1 17.66 +fi 17.67 +if [ -z "$ID_CDROM" ]; then 17.68 + echo "$DEVPATH is not a CD reader." >&2 17.69 + exit 1 17.70 +fi 17.71 + 17.72 +if [ "$1" ]; then 17.73 + METHOD="$1" 17.74 +else 17.75 + METHOD='by-path' 17.76 +fi 17.77 + 17.78 +case "$METHOD" in 17.79 + by-path) 17.80 + if [ -z "$ID_PATH" ]; then 17.81 + echo "$DEVPATH not supported by path_id. by-id may work." >&2 17.82 + exit 1 17.83 + fi 17.84 + RULE="ENV{ID_PATH}==\"$ID_PATH\"" 17.85 + ;; 17.86 + 17.87 + by-id) 17.88 + if [ "$ID_SERIAL" ]; then 17.89 + RULE="ENV{ID_SERIAL}==\"$ID_SERIAL\"" 17.90 + elif [ "$ID_MODEL" -a "$ID_REVISION" ]; then 17.91 + RULE="ENV{ID_MODEL}==\"$ID_MODEL\", ENV{ID_REVISION}==\"$ID_REVISION\"" 17.92 + else 17.93 + echo "$DEVPATH not supported by ata_id. by-path may work." >&2 17.94 + exit 1 17.95 + fi 17.96 + ;; 17.97 + 17.98 + *) 17.99 + echo "Invalid argument (must be either by-path or by-id)." >&2 17.100 + exit 1 17.101 + ;; 17.102 +esac 17.103 + 17.104 +# Prevent concurrent processes from modifying the file at the same time. 17.105 +lock_rules_file 17.106 + 17.107 +# Check if the rules file is writeable. 17.108 +choose_rules_file 17.109 + 17.110 +link_num=$(find_next_available 'cdrom[0-9]*') 17.111 + 17.112 +match="SUBSYSTEM==\"block\", ENV{ID_CDROM}==\"?*\", $RULE" 17.113 + 17.114 +comment="$ID_MODEL ($ID_PATH)" 17.115 + 17.116 + write_rule "$match" "cdrom$link_num" "$comment" 17.117 +[ "$ID_CDROM_CD_R" -o "$ID_CDROM_CD_RW" ] && \ 17.118 + write_rule "$match" "cdrw$link_num" 17.119 +[ "$ID_CDROM_DVD" ] && \ 17.120 + write_rule "$match" "dvd$link_num" 17.121 +[ "$ID_CDROM_DVD_R" -o "$ID_CDROM_DVD_RW" -o "$ID_CDROM_DVD_RAM" ] && \ 17.122 + write_rule "$match" "dvdrw$link_num" 17.123 +echo >> $RULES_FILE 17.124 + 17.125 +unlock_rules_file 17.126 + 17.127 +echo $SYMLINKS 17.128 + 17.129 +exit 0
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/eudev/stuff/udev/write_net_rules Tue Sep 12 01:34:11 2017 +0300 18.3 @@ -0,0 +1,140 @@ 18.4 +#!/bin/sh -e 18.5 + 18.6 +# This script is run to create persistent network device naming rules 18.7 +# based on properties of the device. 18.8 +# If the interface needs to be renamed, INTERFACE_NEW=<name> will be printed 18.9 +# on stdout to allow udev to IMPORT it. 18.10 + 18.11 +# variables used to communicate: 18.12 +# MATCHADDR MAC address used for the match 18.13 +# MATCHID bus_id used for the match 18.14 +# MATCHDEVID dev_id used for the match 18.15 +# MATCHDRV driver name used for the match 18.16 +# MATCHIFTYPE interface type match 18.17 +# COMMENT comment to add to the generated rule 18.18 +# INTERFACE_NAME requested name supplied by external tool 18.19 +# INTERFACE_NEW new interface name returned by rule writer 18.20 + 18.21 +# Copyright (C) 2006 Marco d'Itri <md@Linux.IT> 18.22 +# Copyright (C) 2007 Kay Sievers <kay.sievers@vrfy.org> 18.23 +# 18.24 +# This program is free software: you can redistribute it and/or modify 18.25 +# it under the terms of the GNU General Public License as published by 18.26 +# the Free Software Foundation, either version 2 of the License, or 18.27 +# (at your option) any later version. 18.28 +# 18.29 +# This program is distributed in the hope that it will be useful, 18.30 +# but WITHOUT ANY WARRANTY; without even the implied warranty of 18.31 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18.32 +# GNU General Public License for more details. 18.33 +# 18.34 +# You should have received a copy of the GNU General Public License 18.35 +# along with this program. If not, see <http://www.gnu.org/licenses/>. 18.36 + 18.37 +# debug, if UDEV_LOG=<debug> 18.38 +if [ -n "$UDEV_LOG" ]; then 18.39 + if [ "$UDEV_LOG" -ge 7 ]; then 18.40 + set -x 18.41 + fi 18.42 +fi 18.43 + 18.44 +RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' 18.45 + 18.46 +. /lib/udev/rule_generator.functions 18.47 + 18.48 +interface_name_taken() { 18.49 + local value="$(find_all_rules 'NAME=' $INTERFACE)" 18.50 + if [ "$value" ]; then 18.51 + return 0 18.52 + else 18.53 + return 1 18.54 + fi 18.55 +} 18.56 + 18.57 +find_next_available() { 18.58 + raw_find_next_available "$(find_all_rules 'NAME=' "$1")" 18.59 +} 18.60 + 18.61 +write_rule() { 18.62 + local match="$1" 18.63 + local name="$2" 18.64 + local comment="$3" 18.65 + 18.66 + { 18.67 + if [ "$PRINT_HEADER" ]; then 18.68 + PRINT_HEADER= 18.69 + echo "# This file was automatically generated by the $0" 18.70 + echo "# program, run by the persistent-net-generator.rules rules file." 18.71 + echo "#" 18.72 + echo "# You can modify it, as long as you keep each rule on a single" 18.73 + echo "# line, and change only the value of the NAME= key." 18.74 + fi 18.75 + 18.76 + echo "" 18.77 + [ "$comment" ] && echo "# $comment" 18.78 + echo "SUBSYSTEM==\"net\", ACTION==\"add\"$match, NAME=\"$name\"" 18.79 + } >> $RULES_FILE 18.80 +} 18.81 + 18.82 +if [ -z "$INTERFACE" ]; then 18.83 + echo "missing \$INTERFACE" >&2 18.84 + exit 1 18.85 +fi 18.86 + 18.87 +# Prevent concurrent processes from modifying the file at the same time. 18.88 +lock_rules_file 18.89 + 18.90 +# Check if the rules file is writeable. 18.91 +choose_rules_file 18.92 + 18.93 +# the DRIVERS key is needed to not match bridges and VLAN sub-interfaces 18.94 +if [ "$MATCHADDR" ]; then 18.95 + match="$match, DRIVERS==\"?*\", ATTR{address}==\"$MATCHADDR\"" 18.96 +fi 18.97 + 18.98 +if [ "$MATCHDRV" ]; then 18.99 + match="$match, DRIVERS==\"$MATCHDRV\"" 18.100 +fi 18.101 + 18.102 +if [ "$MATCHDEVID" ]; then 18.103 + match="$match, ATTR{dev_id}==\"$MATCHDEVID\"" 18.104 +fi 18.105 + 18.106 +if [ "$MATCHID" ]; then 18.107 + match="$match, KERNELS==\"$MATCHID\"" 18.108 +fi 18.109 + 18.110 +if [ "$MATCHIFTYPE" ]; then 18.111 + match="$match, ATTR{type}==\"$MATCHIFTYPE\"" 18.112 +fi 18.113 + 18.114 +if [ -z "$match" ]; then 18.115 + echo "missing valid match" >&2 18.116 + unlock_rules_file 18.117 + exit 1 18.118 +fi 18.119 + 18.120 +basename=${INTERFACE%%[0-9]*} 18.121 + 18.122 +if [ "$INTERFACE_NAME" ]; then 18.123 + # external tools may request a custom name 18.124 + COMMENT="$COMMENT (custom name provided by external tool)" 18.125 + if [ "$INTERFACE_NAME" != "$INTERFACE" ]; then 18.126 + INTERFACE=$INTERFACE_NAME; 18.127 + echo "INTERFACE_NEW=$INTERFACE" 18.128 + fi 18.129 +else 18.130 + # if a rule using the current name already exists, find a new name 18.131 + if interface_name_taken; then 18.132 + INTERFACE="$basename$(find_next_available "$basename[0-9]*")" 18.133 + # prevent INTERFACE from being "eth" instead of "eth0" 18.134 + [ "$INTERFACE" = "${INTERFACE%%[ \[\]0-9]*}" ] && INTERFACE=${INTERFACE}0 18.135 + echo "INTERFACE_NEW=$INTERFACE" 18.136 + fi 18.137 +fi 18.138 + 18.139 +write_rule "$match" "$INTERFACE" "$COMMENT" 18.140 + 18.141 +unlock_rules_file 18.142 + 18.143 +exit 0
19.1 --- a/make-slitaz-icons/receipt Fri Sep 08 15:20:22 2017 +0300 19.2 +++ b/make-slitaz-icons/receipt Tue Sep 12 01:34:11 2017 +0300 19.3 @@ -1,7 +1,7 @@ 19.4 # SliTaz package receipt v2. 19.5 19.6 PACKAGE="make-slitaz-icons" 19.7 -VERSION="170814" 19.8 +VERSION="170911" 19.9 CATEGORY="development" 19.10 SHORT_DESC="Make SliTaz icon theme" 19.11 MAINTAINER="al.bobylev@gmail.com"
20.1 --- a/make-slitaz-icons/stuff/mksit.sh Fri Sep 08 15:20:22 2017 +0300 20.2 +++ b/make-slitaz-icons/stuff/mksit.sh Tue Sep 12 01:34:11 2017 +0300 20.3 @@ -3,7 +3,7 @@ 20.4 # Aleksej Bobylev <al.bobylev@gmail.com>, 2014-2017 20.5 # (Started in November 2014) 20.6 20.7 -VERSION="170814" 20.8 +VERSION="170911" 20.9 20.10 . /lib/libtaz.sh 20.11 20.12 @@ -63,7 +63,7 @@ 20.13 for SIZE in $SIZES; do 20.14 FOUND='' 20.15 for ICON in $(echo "$@" | sed 's|\([^ ]*\)|& gnome-mime-& gnome-dev-&|'); do 20.16 - FINDICON=$(findi $ICON | sed "s|$FROM||g" | grep -e "/$SIZE/" -e "/${SIZE}x$SIZE/") 20.17 + FINDICON=$(findi $ICON | sed "s|$FROM||g" | grep -e "/$SIZE/" -e "/${SIZE}x$SIZE/" -e "/scalable/") 20.18 20.19 if [ -n "$FINDICON" ]; then 20.20 if [ $(echo "$FINDICON" | wc -l) != "1" ]; then 20.21 @@ -299,7 +299,7 @@ 20.22 c mail-mark-unread 20.23 c mail-message-new 20.24 c mail-reply-all 20.25 -c mail-reply-sender 20.26 +c mail-reply-sender mail-reply 20.27 c mail-send 20.28 c mail-send-receive 20.29 c media-eject list-remove # Matrilineare hack 20.30 @@ -317,7 +317,7 @@ 20.31 c object-rotate-right 20.32 s process-stop # gtk_stock 16,24 20.33 c system-lock-screen lock # Matrilineare hack 20.34 -c system-log-out contact-new # Matrilineare hack 20.35 +#c system-log-out contact-new # Matrilineare hack 20.36 c system-run # gtk_stock 16,24; Transmission (GTK+3) needs it 20.37 c system-search find # Matrilineare hack 20.38 c system-reboot system-run # Matrilineare hack 20.39 @@ -329,7 +329,7 @@ 20.40 s view-sort-ascending # gtk_stock 16,24 20.41 s view-sort-descending # gtk_stock 16,24 20.42 c window-close # gtk_stock 16,20,24; Transmission (GTK+3) needs it 20.43 -c window-new 20.44 +c window-new list-add 20.45 s zoom-fit-best # gtk_stock 16,24 20.46 s zoom-in # gtk_stock 16,24 20.47 s zoom-original # gtk_stock 16,24 20.48 @@ -347,13 +347,22 @@ 20.49 c gtk-go-forward gtk-go-forward-ltr # tazbox tz Yad dialog 20.50 c bookmark-new # Midori 20.51 c empty # Yad:tazbox new-file 20.52 -c extract-archive # tazpkg-box, xarchiver... 20.53 +c extract-archive document-export # tazpkg-box, xarchiver... 20.54 c package-install # tazpkg-box 20.55 20.56 +c system-log-out-panel system-log-out-symbolic # lxpanel logout menu 20.57 +c system-reboot-panel system-restart-symbolic # 20.58 +c system-shutdown-panel system-shutdown-symbolic # 20.59 + 20.60 + 20.61 SIZES='16 48' 20.62 c document-new # Yad:tazbox new-file 20.63 c document-properties # Yad:tazbox locale, tazbox manage-i18n 20.64 20.65 +c system-log-out # lxpanel logout menu 20.66 +c system-reboot # 20.67 +c system-shutdown # 20.68 + 20.69 20.70 ############################ 20.71 # Standard Animation Icons # 20.72 @@ -388,26 +397,27 @@ 20.73 c system-software-update # update-notifier 20.74 c utilities-system-monitor 20.75 c utilities-terminal 20.76 +c utilities-root-terminal utilities-terminal 20.77 #------------------- 20.78 c gcolor2 # gcolor2.desktop 20.79 c gnome-glchess # chess.desktop 20.80 c gpicview # gpicview.desktop 20.81 -c tazcalc gnumeric # tazcalc.desktop 20.82 -c alsaplayer gnome-audio # alsaplayer.desktop 20.83 -c leafpad # leafpad.desktop 20.84 +c tazcalc gnumeric x-office-spreadsheet # tazcalc.desktop 20.85 +c alsaplayer gnome-audio gnome-mplayer # alsaplayer.desktop 20.86 +c leafpad accessories-text-editor # leafpad.desktop 20.87 c midori # midori.desktop 20.88 c mtpaint # mtpaint.desktop 20.89 c xterm # xterm.desktop 20.90 -c burn-box brasero # burn-box.desktop 20.91 -c iso-image-burn # burn-iso.desktop 20.92 -c system-log-out # lxde-logout.desktop 20.93 +c burn-box brasero disk-burner # burn-box.desktop 20.94 +c iso-image-burn disk-burner # burn-iso.desktop 20.95 +#c system-log-out # lxde-logout.desktop 20.96 c sudoku gnome-sudoku # sudoku.desktop 20.97 c utilities-log-viewer # bootlog.desktop 20.98 c preferences-desktop-display # lxrandr.desktop 20.99 c tazbug bug-buddy # tazbug.desktop 20.100 c applets-screenshooter # mtpaint-grab.desktop 20.101 -c tazwikiss zim # tazwikiss.desktop 20.102 -c system-software-installer # tazpanel-pkgs.desktop 20.103 +c tazwikiss zim accessories-notes # tazwikiss.desktop 20.104 +c system-software-installer software-center software-store # tazpanel-pkgs.desktop 20.105 c session-properties # lxsession-edit.desktop 20.106 c terminal # sakura.desktop 20.107 c user_auth # passwd.desktop 20.108 @@ -418,7 +428,7 @@ 20.109 c network-wireless # wifi-box.desktop 20.110 c gparted # gparted.desktop 20.111 c epdfview acroread # epdfview.desktop 20.112 -c menu-editor # libfm-pref-apps.desktop 20.113 +#c menu-editor # libfm-pref-apps.desktop 20.114 c preferences-system-windows # obconf.desktop 20.115 c twitter # twitter.desktop 20.116 c network-server # httpd.desktop 20.117 @@ -613,7 +623,7 @@ 20.118 # packages 20.119 c $A-vnd.android.package-archive 20.120 c $A-x-deb 20.121 -c $A-x-java-archive 20.122 +c $A-x-java-archive java 20.123 c $A-x-rpm 20.124 c $A-x-source-rpm $A-x-rpm 20.125 c $A-x-tazpkg package-x-generic 20.126 @@ -677,7 +687,7 @@ 20.127 c text-x-install 20.128 c text-x-log text-x-changelog 20.129 c text-x-makefile 20.130 -c text-x-markdown text-x-source 20.131 +c text-x-markdown text-markdown text-x-source 20.132 c text-x-patch 20.133 c text-x-python 20.134 c text-x-readme 20.135 @@ -719,14 +729,10 @@ 20.136 ######################### 20.137 # Standard Status Icons # 20.138 ######################### 20.139 -CATEGORY='status'; SIZES='22'; echo_cat 20.140 +CATEGORY='status'; SIZES='16'; echo_cat 20.141 20.142 c appointment-missed 20.143 c appointment-soon 20.144 -c audio-volume-high # gtk_stock 24 20.145 -c audio-volume-low # gtk_stock 24 20.146 -c audio-volume-medium # gtk_stock 24 20.147 -c audio-volume-muted # gtk_stock 24 20.148 c battery-caution notification-battery-empty 20.149 c battery-low notification-battery-low 20.150 c dialog-error # gtk_stock 48 20.151 @@ -758,8 +764,6 @@ 20.152 c security-high 20.153 c security-medium 20.154 c security-low 20.155 -c software-update-available 20.156 -c software-update-urgent 20.157 c sync-error 20.158 c sync-synchronizing 20.159 c task-due 20.160 @@ -792,6 +796,12 @@ 20.161 c dialog-question 20.162 c dialog-warning 20.163 c appointment-soon # Yad:tazbox manage-i18n 20.164 +c audio-volume-high # gtk_stock 24 20.165 +c audio-volume-low # gtk_stock 24 20.166 +c audio-volume-medium # gtk_stock 24 20.167 +c audio-volume-muted # gtk_stock 24 20.168 +c software-update-available 20.169 +c software-update-urgent 20.170 20.171 # LXPanel status icons 20.172 SIZES="22"
21.1 --- a/ntfs-3g/receipt Fri Sep 08 15:20:22 2017 +0300 21.2 +++ b/ntfs-3g/receipt Tue Sep 12 01:34:11 2017 +0300 21.3 @@ -53,6 +53,7 @@ 21.4 copy @std 21.5 remove_already_packed 21.6 CONFIG_FILES="/etc/filesystems" 21.7 + DEPENDS=" " 21.8 ;; 21.9 *-dev) 21.10 copy @dev
22.1 --- a/pcmanfm/receipt Fri Sep 08 15:20:22 2017 +0300 22.2 +++ b/pcmanfm/receipt Tue Sep 12 01:34:11 2017 +0300 22.3 @@ -40,6 +40,9 @@ 22.4 mkdir -p $install/usr/share/file-manager && 22.5 cp -r $stuff/actions/ $install/usr/share/file-manager && 22.6 install -m755 $stuff/gvfs-mount-archive.sh $install/usr/bin 22.7 + 22.8 + # avoid warning about missed modules dir 22.9 + mkdir -p $install/usr/lib/pcmanfm 22.10 } 22.11 22.12 # Rules to gen a SliTaz package suitable for Tazpkg.
23.1 --- a/polkit/receipt Fri Sep 08 15:20:22 2017 +0300 23.2 +++ b/polkit/receipt Tue Sep 12 01:34:11 2017 +0300 23.3 @@ -33,6 +33,8 @@ 23.4 23.5 # for access file in web interface, will be changed back in post-install to 700 23.6 chmod 755 "$install/etc/polkit-1/rules.d/" 23.7 + 23.8 + cp $stuff/*.rules $install/etc/polkit-1/rules.d/ 23.9 } 23.10 23.11 # Rules to gen a SliTaz package suitable for Tazpkg.
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/polkit/stuff/10-udisks2.rules Tue Sep 12 01:34:11 2017 +0300 24.3 @@ -0,0 +1,13 @@ 24.4 +// See the polkit(8) man page for more information 24.5 +// about configuring polkit. 24.6 + 24.7 +// Allow udisks2 to mount devices without authentication 24.8 +// for users in the "disk" group. 24.9 + 24.10 +polkit.addRule(function(action, subject) { 24.11 + if ((action.id == "org.freedesktop.udisks2.filesystem-mount-system" || 24.12 + action.id == "org.freedesktop.udisks2.filesystem-mount") && 24.13 + subject.isInGroup("disk")) { 24.14 + return polkit.Result.YES; 24.15 + } 24.16 +});
25.1 --- a/slitaz-base-files/receipt Fri Sep 08 15:20:22 2017 +0300 25.2 +++ b/slitaz-base-files/receipt Tue Sep 12 01:34:11 2017 +0300 25.3 @@ -1,9 +1,9 @@ 25.4 -# SliTaz package receipt. 25.5 +# SliTaz package receipt v2. 25.6 25.7 PACKAGE="slitaz-base-files" 25.8 -VERSION="330" 25.9 +VERSION="331" 25.10 CATEGORY="base-system" 25.11 -SHORT_DESC="Linux tree and the necessary files for the base system." 25.12 +SHORT_DESC="Linux tree and the necessary files for the base system" 25.13 MAINTAINER="pankso@slitaz.org" 25.14 LICENSE="BSD GPL3" 25.15 WEB_SITE="http://www.slitaz.org/" 25.16 @@ -12,100 +12,59 @@ 25.17 TARBALL="$PACKAGE-$VERSION.tar.bz2" 25.18 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2" 25.19 25.20 -DEPENDS="gettext-base" 25.21 BUILD_DEPENDS="gettext" 25.22 25.23 -CONFIG_FILES=" 25.24 -/etc/adduser.conf 25.25 -/etc/passwd 25.26 -/etc/fstab 25.27 -/etc/issue 25.28 -/etc/hosts 25.29 -/etc/host.conf 25.30 -/etc/hostname 25.31 -/etc/group 25.32 -/etc/gshadow 25.33 -/etc/shadow 25.34 -/etc/daemons.conf 25.35 -/etc/nsswitch.conf 25.36 -/etc/networks 25.37 -/etc/profile 25.38 -/etc/securetty 25.39 -/etc/services 25.40 -/etc/shells" 25.41 - 25.42 # Rules to configure and make the package. 25.43 compile_rules() 25.44 { 25.45 - make DESTDIR=$DESTDIR install 25.46 + make DESTDIR=$install install 25.47 + 25.48 + for i in /bin /dev /home /media/cdrom /media/flash /media/usbdisk /mnt \ 25.49 + /proc /root /run /sbin /sys /tmp /usr/bin /usr/games /usr/lib /usr/sbin \ 25.50 + /usr/share/doc /var/cache /var/games /var/lib /var/lock /var/log/slitaz \ 25.51 + /var/spool /var/tmp /var/run 25.52 + do 25.53 + mkdir -p $install$i 25.54 + done 25.55 + 25.56 + # Create /etc/mtab symlink 25.57 + ln -s /proc/mounts $install/etc/mtab 25.58 + 25.59 + # Add httphelper link 25.60 + ln -s httphelper.sh $install/usr/lib/slitaz/httphelper 25.61 + 25.62 + # Populate /dev with $fs/sbin/mktazdevs.sh. 25.63 + # Not required with udev. 25.64 + # $fs/sbin/mktazdevs.sh $fs/dev 25.65 + 25.66 + # Update copyright year 25.67 + grep -rl 'copy; 2' $fs/var/www | xargs \ 25.68 + sed -i "s/copy; [0-9]*/copy; $(date +%Y)/" 25.69 + 25.70 + # Set release 25.71 + echo 'next' > $fs/etc/slitaz-release 25.72 + 25.73 + chown -R root:root $install 25.74 + chmod 1777 $install/tmp 25.75 + chmod 640 $install/etc/shadow 25.76 + chmod 640 $install/etc/gshadow 25.77 + chmod 0750 $install/root 25.78 } 25.79 25.80 # Rules to gen a SliTaz package suitable for Tazpkg. 25.81 genpkg_rules() 25.82 { 25.83 - mkdir -p \ 25.84 - $fs/bin \ 25.85 - $fs/dev \ 25.86 - $fs/home \ 25.87 - $fs/media/cdrom \ 25.88 - $fs/media/flash \ 25.89 - $fs/media/usbdisk \ 25.90 - $fs/mnt \ 25.91 - $fs/proc \ 25.92 - $fs/root \ 25.93 - $fs/run \ 25.94 - $fs/sbin \ 25.95 - $fs/sys \ 25.96 - $fs/tmp \ 25.97 - $fs/usr/bin \ 25.98 - $fs/usr/games \ 25.99 - $fs/usr/lib \ 25.100 - $fs/usr/sbin \ 25.101 - $fs/usr/share/doc \ 25.102 - $fs/var/cache \ 25.103 - $fs/var/games \ 25.104 - $fs/var/lib \ 25.105 - $fs/var/lock \ 25.106 - $fs/var/log/slitaz \ 25.107 - $fs/var/spool \ 25.108 - $fs/var/tmp \ 25.109 - $fs/var/run 25.110 - 25.111 - # Daemons may store the pid files in /var/run 25.112 - # from 5.0 /var/run is mounted as tmpfs 25.113 - #ln -s /run $fs/var/run 25.114 - 25.115 - # Copy all installed files and set permissions. 25.116 cp -a $install/* $fs 25.117 - 25.118 - chown -R root.root $fs/* 25.119 - chmod 1777 $fs/tmp 25.120 - chmod 640 $fs/etc/shadow 25.121 - chmod 640 $fs/etc/gshadow 25.122 - chmod 0750 $fs/root 25.123 - 25.124 - # Populate /dev with $fs/sbin/mktazdevs.sh. 25.125 - $fs/sbin/mktazdevs.sh $fs/dev 25.126 - 25.127 - # Create /etc/mtab symlink. 25.128 - cd $fs/etc 25.129 - ln -s /proc/mounts mtab 25.130 - 25.131 - # Fix httphelper link 25.132 - cd $fs/usr/lib/slitaz 25.133 - ln -s httphelper.sh httphelper 25.134 - 25.135 - # Update copyright year 25.136 - grep -rl 'copy; 2' $fs/var/www | xargs \ 25.137 - sed -i "s/copy; [0-9]*/copy; $(date +%Y)/" 25.138 - 25.139 - echo 'next' > $fs/etc/slitaz-release 25.140 + DEPENDS="gettext-base" 25.141 + CONFIG_FILES="/etc/adduser.conf /etc/passwd /etc/fstab /etc/issue \ 25.142 + /etc/hosts /etc/host.conf /etc/hostname /etc/group /etc/gshadow \ 25.143 + /etc/shadow /etc/daemons.conf /etc/nsswitch.conf /etc/networks \ 25.144 + /etc/profile /etc/securetty /etc/services /etc/shells" 25.145 } 25.146 25.147 -# Pre and post install to backup all /etc/settings 25.148 +# Pre and post install to backup all /etc settings 25.149 # 25.150 -pre_install() 25.151 -{ 25.152 +pre_install() { 25.153 cp -a "$1/etc" "$1/tmp/etc.bak" 2>/dev/null 25.154 [ -x "$1/usr/bin/sudo" ] && mv "$1/usr/bin/sudo" "$1/usr/bin/sudo.orig" 25.155 # Remove old /var/run symlink 25.156 @@ -113,13 +72,13 @@ 25.157 : 25.158 } 25.159 25.160 -post_install() 25.161 -{ 25.162 +post_install() { 25.163 if cp -a "$1/tmp/etc.bak"/* "$1/etc"; then 25.164 rm -r "$1/tmp/etc.bak" 25.165 fi 2>/dev/null 25.166 25.167 - [ -x "$1/usr/bin/sudo.orig" ] && mv -f "$1/usr/bin/sudo.orig" "$1/usr/bin/sudo" 25.168 + [ -x "$1/usr/bin/sudo.orig" ] && 25.169 + mv -f "$1/usr/bin/sudo.orig" "$1/usr/bin/sudo" 25.170 25.171 # Reset permission. 25.172 chmod 640 "$1/etc/shadow" 25.173 @@ -130,8 +89,7 @@ 25.174 fi 25.175 } 25.176 25.177 -pre_remove() 25.178 -{ 25.179 - # We can not remove this package! 25.180 +# We can not remove this package! 25.181 +pre_remove() { 25.182 exit 1 25.183 }
26.1 --- a/slitaz-boot-scripts/receipt Fri Sep 08 15:20:22 2017 +0300 26.2 +++ b/slitaz-boot-scripts/receipt Tue Sep 12 01:34:11 2017 +0300 26.3 @@ -1,9 +1,9 @@ 26.4 # SliTaz package receipt. 26.5 26.6 PACKAGE="slitaz-boot-scripts" 26.7 -VERSION="440" 26.8 +VERSION="442" 26.9 CATEGORY="base-system" 26.10 -SHORT_DESC="Provide all the initialisation scripts used at boot time." 26.11 +SHORT_DESC="Provide all the initialisation scripts used at boot time" 26.12 MAINTAINER="pankso@slitaz.org" 26.13 LICENSE="GPL3" 26.14 WEB_SITE="http://www.slitaz.org/"
27.1 --- a/slitaz-icons-paper/receipt Fri Sep 08 15:20:22 2017 +0300 27.2 +++ b/slitaz-icons-paper/receipt Tue Sep 12 01:34:11 2017 +0300 27.3 @@ -12,9 +12,13 @@ 27.4 27.5 # Rules to compile and make the package. 27.6 compile_rules() { 27.7 + to="$install/usr/share/icons/SliTaz-Paper" 27.8 + mkdir -p $to 27.9 + cp -r $stuff/22x22 $to 27.10 + 27.11 mksit.sh \ 27.12 -f /usr/share/icons/Paper \ 27.13 - -t $install/usr/share/icons/SliTaz-Paper \ 27.14 + -t $to \ 27.15 -opmax 27.16 } 27.17
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/slitaz-icons-paper/stuff/22x22/status/avatar-default.svg Tue Sep 12 01:34:11 2017 +0300 28.3 @@ -0,0 +1,1 @@ 28.4 +<svg height="22" width="22" xmlns="http://www.w3.org/2000/svg"><path d="m11 5c1.7 0 3 1.3 3 3s-1.3 3-3 3-3-1.3-3-3 1.3-3 3-3zm0 8c6 0 6 4 6 4v1h-12v-1s0-4 6-4z" fill="#dbdee0"/></svg> 28.5 \ No newline at end of file
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/slitaz-icons-paper/stuff/22x22/status/start-here.svg Tue Sep 12 01:34:11 2017 +0300 29.3 @@ -0,0 +1,1 @@ 29.4 +<svg height="22" width="22" xmlns="http://www.w3.org/2000/svg"><path d="m3.5 1s-2.5 0-2.5 2.5v15s0 2.5 2.5 2.5h15s2.5 0 2.5-2.5v-15s0-2.5-2.5-2.5zm6.5 1.9-.5.5c-1.1 1.1-2 2.6-2.2 3.6l-.1.5.5.5c.8.8 1.9 1.6 2 1.5s.1-.2.1-.5c.1-.6.5-1.2 1.2-1.6.8-.4 1.4-.2 1.9.4.2.4.2.4.2 1.1v.8c.2 0 2.9-1.9 3.1-2.1.1-.1 0-1.4-.2-2.1-.1-.4-.5-1.1-.8-1.6-.5-.9-.5-.9-.2-.6.9.6 1.9 2.2 2.4 3.6.2 1 .2 1 .1 1.2-.1.1-.8.6-1.4 1s-.6.4-1 .8c.2.1 2.9-.9 3.1-1.1.1-.1.2-.4.2-.6 0-.9-.2-2.9-.4-3.5l-.1-.8c.1-.1.8.9 1 1.6.4.8.8 2.8.8 3.5v.5l-1.2.5c-.8.2-1.6.5-1.9.6-.8.2-.8.4-.1.5.9.1 3.2.5 3.4.6.1.1-.1 1.6-.6 3-.2.9-1.2 2.8-1.5 2.8s0-.2.1-.6c.4-1.2.8-4 .5-4.2l-1-.2-1.2-.2c-.5-.1-.5.1.1.5 1.1.8 1.6 1.1 1.6 1.4 0 .4-1 2.1-1.6 3l-1.2 1.5c-.8.8-1.6 1.5-1.4 1.1s.1-.1.8-1c .8-1 1.2-1.8 1.6-2.9.5-1.2.4-1.4-.5-2s-1.5-1.1-1.6-1.1v.8c.2 2.1-1 4.5-2.6 5.2-.5.2-1.5.2-1.9.1-1.5-.9-2-3.4-1-5.8 0-.1 0-.2-.1-.2-.2 0-2.5 1.4-2.8 1.6-.2.2-.1 1.8.1 2.8.1.5.4 1.2.6 1.8l.5.9-.6-.6c-.9-.9-1.6-2.5-1.9-4l-.2-1.1.2-.2 1.2-.8c1.2-.8 1.5-.9.6-.8s-2.4.4-2.5.5c-.2.4-.6 2.9-.6 3.9s0 1-.1.8l-.4-1.1c-.1-.8-.1-1-.1-2.4.1-2.1.1-2.1.6-2.2l3.1-.5c.6-.1.8-.2.4-.4l-3.2-1.2c-.1-.1.1-.9.9-2.2.5-.9.9-1.6 1.5-2.2l.9-.9-.4.8c-.5.8-1.4 3.6-1.4 3.8 0 .1 2.9 1.2 3 1.1l-.9-.9c-.5-.5-1-.9-1-1s .2-.6.5-1.1c.4-.8.9-1.2 1.8-2.1.6-.6 1.2-1.1 1.9-1.6z" fill="#dbdee0"/></svg> 29.5 \ No newline at end of file
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/slitaz-next/stuff/etc/skel/.config/lxpanel/slitaz/panels/panel Tue Sep 12 01:34:11 2017 +0300 30.3 @@ -0,0 +1,218 @@ 30.4 +# lxpanel <profile> config file. Manually editing is not recommended. 30.5 +# Use preference dialog in lxpanel to adjust config when you can. 30.6 + 30.7 +Global { 30.8 + edge=top 30.9 + allign=center 30.10 + margin=0 30.11 + widthtype=percent 30.12 + width=100 30.13 + height=22 30.14 + transparent=0 30.15 + tintcolor=#222222 30.16 + alpha=255 30.17 + autohide=0 30.18 + heightwhenhidden=2 30.19 + setdocktype=1 30.20 + setpartialstrut=1 30.21 + usefontcolor=0 30.22 + fontsize=10 30.23 + fontcolor=#cfcfcf 30.24 + usefontsize=0 30.25 + background=0 30.26 + backgroundfile= 30.27 + iconsize=22 30.28 + loglevel=2 30.29 +} 30.30 + 30.31 +Plugin { 30.32 + type = menu 30.33 + Config { 30.34 + name=SliTazMenu.directory 30.35 + image=start-here 30.36 + tintcolor=#33230D 30.37 + system { 30.38 + } 30.39 + separator { 30.40 + } 30.41 + item { 30.42 + command=run 30.43 + image=gtk-execute 30.44 + } 30.45 + separator { 30.46 + } 30.47 + item { 30.48 + image=system-shutdown-panel-restart 30.49 + command=logout 30.50 + } 30.51 + } 30.52 +} 30.53 + 30.54 +Plugin { 30.55 + type = space 30.56 + Config { 30.57 + Size=2 30.58 + } 30.59 +} 30.60 + 30.61 +Plugin { 30.62 + type = pager 30.63 +} 30.64 + 30.65 +Plugin { 30.66 + type = space 30.67 + Config { 30.68 + Size=2 30.69 + } 30.70 +} 30.71 + 30.72 +Plugin { 30.73 + type = taskbar 30.74 + expand=1 30.75 + Config { 30.76 + tooltips=1 30.77 + IconsOnly=0 30.78 + ShowAllDesks=0 30.79 + UseMouseWheel=1 30.80 + UseUrgencyHint=1 30.81 + FlatButton=0 30.82 + MaxTaskWidth=160 30.83 + spacing=0 30.84 + GroupedTasks=0 30.85 + } 30.86 +} 30.87 + 30.88 +Plugin { 30.89 + type = space 30.90 + Config { 30.91 + Size=2 30.92 + } 30.93 +} 30.94 + 30.95 +Plugin { 30.96 + type = xkb 30.97 + Config { 30.98 + DisplayType=1 30.99 + PerWinLayout=0 30.100 + NoResetOpt=0 30.101 + KeepSysLayouts=1 30.102 + Model=pc105 30.103 + LayoutsList=us 30.104 + VariantsList=, 30.105 + ToggleOpt=shift_caps_toggle 30.106 + FlagSize=4 30.107 + } 30.108 +} 30.109 + 30.110 +Plugin { 30.111 + type = tray 30.112 +} 30.113 + 30.114 +Plugin { 30.115 + type = space 30.116 + Config { 30.117 + Size=4 30.118 + } 30.119 +} 30.120 + 30.121 +Plugin { 30.122 + type = volumealsa 30.123 +} 30.124 + 30.125 +Plugin { 30.126 + type = space 30.127 + Config { 30.128 + Size=6 30.129 + } 30.130 +} 30.131 + 30.132 +Plugin { 30.133 + type = netstatus 30.134 + Config { 30.135 + iface=eth0 30.136 + configtool=subox tazpanel network 30.137 + } 30.138 +} 30.139 + 30.140 +Plugin { 30.141 + type = space 30.142 + Config { 30.143 + Size=6 30.144 + } 30.145 +} 30.146 + 30.147 +Plugin { 30.148 + type = batt 30.149 + Config { 30.150 + HideIfNoBattery=0 30.151 + AlarmTime=5 30.152 + BackgroundColor=#404040 30.153 + BorderWidth=3 30.154 + ChargingColor1=#00A100 30.155 + ChargingColor2=#00A100 30.156 + DischargingColor1=#DB2C23 30.157 + DischargingColor2=#DB2C23 30.158 + Size=11 30.159 + } 30.160 +} 30.161 + 30.162 +Plugin { 30.163 + type = space 30.164 + Config { 30.165 + Size=6 30.166 + } 30.167 +} 30.168 + 30.169 +Plugin { 30.170 + type = cpu 30.171 +} 30.172 + 30.173 +Plugin { 30.174 + type = space 30.175 + Config { 30.176 + Size=4 30.177 + } 30.178 +} 30.179 + 30.180 +Plugin { 30.181 + type = dclock 30.182 + Config { 30.183 + ClockFmt=%R 30.184 + TooltipFmt=%c 30.185 + BoldFont=1 30.186 + IconOnly=0 30.187 + CenterText=1 30.188 + } 30.189 +} 30.190 + 30.191 +Plugin { 30.192 + type = menu 30.193 + Config { 30.194 + name=user.directory 30.195 + image=avatar-default 30.196 + tintcolor=#33230D 30.197 + item { 30.198 + image=system-log-out-panel 30.199 + name=Close X session 30.200 + action=tazbox logout exit 30.201 + } 30.202 + item { 30.203 + image=system-reboot-panel 30.204 + name=Reboot system 30.205 + action=tazbox logout reboot 30.206 + } 30.207 + item { 30.208 + image=system-shutdown-panel 30.209 + name=Shutdown system 30.210 + action=tazbox logout halt 30.211 + } 30.212 + } 30.213 +} 30.214 + 30.215 +Plugin { 30.216 + type = space 30.217 + Config { 30.218 + Size=4 30.219 + } 30.220 +} 30.221 +
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/LXDE/desktop-items-0.conf Tue Sep 12 01:34:11 2017 +0300 31.3 @@ -0,0 +1,13 @@ 31.4 +[*] 31.5 +wallpaper_mode=crop 31.6 +wallpaper_common=1 31.7 +desktop_bg=#000000 31.8 +desktop_fg=#ffffff 31.9 +desktop_shadow=#000000 31.10 +desktop_font=Sans 10 31.11 +show_wm_menu=1 31.12 +sort=mtime;ascending;mingle; 31.13 +show_documents=1 31.14 +show_trash=1 31.15 +show_mounts=1 31.16 +
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/LXDE/pcmanfm.conf Tue Sep 12 01:34:11 2017 +0300 32.3 @@ -0,0 +1,26 @@ 32.4 +[config] 32.5 +bm_open_method=0 32.6 + 32.7 +[volume] 32.8 +mount_on_startup=1 32.9 +mount_removable=1 32.10 +autorun=1 32.11 + 32.12 +[ui] 32.13 +always_show_tabs=0 32.14 +max_tab_chars=32 32.15 +win_width=640 32.16 +win_height=480 32.17 +splitter_pos=150 32.18 +media_in_new_tab=0 32.19 +desktop_folder_new_win=0 32.20 +change_tab_on_drop=1 32.21 +close_on_unmount=0 32.22 +focus_previous=0 32.23 +side_pane_mode=places 32.24 +view_mode=icon 32.25 +show_hidden=0 32.26 +sort=name;ascending; 32.27 +toolbar=newtab;navigation;home; 32.28 +show_statusbar=1 32.29 +pathbar_mode_buttons=1
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/default/desktop-items-0.conf Tue Sep 12 01:34:11 2017 +0300 33.3 @@ -0,0 +1,14 @@ 33.4 +[*] 33.5 +wallpaper_mode=crop 33.6 +wallpaper_common=1 33.7 +wallpaper=/usr/share/images/slitaz-background.jpg 33.8 +desktop_bg=#000000 33.9 +desktop_fg=#ffffff 33.10 +desktop_shadow=#000000 33.11 +desktop_font=Sans 10 33.12 +show_wm_menu=1 33.13 +sort=mtime;ascending; 33.14 +show_documents=1 33.15 +show_trash=1 33.16 +show_mounts=1 33.17 +
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/slitaz-next/stuff/etc/skel/.config/pcmanfm/main.lxde Tue Sep 12 01:34:11 2017 +0300 34.3 @@ -0,0 +1,15 @@ 34.4 +[General] 34.5 +big_icon_size=48 34.6 +terminal=sakura 34.7 + 34.8 +[Window] 34.9 +width=640 34.10 +height=480 34.11 +splitter_pos=160 34.12 +maximized=0 34.13 + 34.14 +[Desktop] 34.15 +show_desktop=1 34.16 +show_wallpaper=1 34.17 +wallpaper=/usr/share/images/slitaz-background.jpg 34.18 +show_wm_menu=1
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/slitaz-next/stuff/etc/xdg/pcmanfm/default/pcmanfm.conf Tue Sep 12 01:34:11 2017 +0300 35.3 @@ -0,0 +1,34 @@ 35.4 +[config] 35.5 +bm_open_method=0 35.6 +su_cmd=subox %s 35.7 + 35.8 +[volume] 35.9 +mount_on_startup=0 35.10 +mount_removable=1 35.11 +autorun=1 35.12 + 35.13 +[desktop] 35.14 +wallpaper_mode=crop 35.15 +wallpaper=/usr/share/images/slitaz-background.jpg 35.16 +desktop_bg=#000000 35.17 +desktop_fg=#ffffff 35.18 +desktop_shadow=#000000 35.19 +desktop_font=Sans 9 35.20 +show_wm_menu=1 35.21 +show_documents=1 35.22 +show_trash=1 35.23 +show_mounts=1 35.24 + 35.25 +[ui] 35.26 +close_on_unmount=0 35.27 +focus_previous=1 35.28 +always_show_tabs=0 35.29 +max_tab_chars=32 35.30 +win_width=640 35.31 +win_height=480 35.32 +splitter_pos=150 35.33 +side_pane_mode=1 35.34 +view_mode=0 35.35 +show_hidden=0 35.36 +sort_type=0 35.37 +sort_by=2
36.1 Binary file slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-log-out.png has changed
37.1 Binary file slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-reboot.png has changed
38.1 Binary file slitaz-next/stuff/usr/share/icons/SliTaz-Paper/48x48/actions/system-shutdown.png has changed