Attachment 185064 Details for Bug 202367 – linprocfs and df compatibility fixes

linprocfs and df compatibility fixes

byobu.shar (text/plain), 23.81 KB, created by Justin Coffman on 2017-08-05 22:42:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Justin Coffman

Created: 2017-08-05 22:42:19 UTC

Size: 23.81 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	byobu
>#	byobu/pkg-plist
>#	byobu/pkg-message
>#	byobu/distinfo
>#	byobu/files
>#	byobu/files/patch-usr_lib_byobu_network
>#	byobu/files/patch-usr_lib_byobu_cpu__freq
>#	byobu/files/patch-usr_lib_byobu_entropy
>#	byobu/files/patch-usr_lib_byobu_ec2__cost
>#	byobu/files/patch-usr_lib_byobu_swap
>#	byobu/files/patch-usr_lib_byobu_cpu__count
>#	byobu/files/patch-usr_lib_byobu_disk
>#	byobu/files/patch-usr_lib_byobu_raid
>#	byobu/files/patch-usr_lib_byobu_fan__speed
>#	byobu/files/patch-usr_lib_byobu_processes
>#	byobu/files/patch-usr_lib_byobu_uptime
>#	byobu/files/patch-usr_lib_byobu_rcs__cost
>#	byobu/files/patch-usr_lib_byobu_cpu__temp
>#	byobu/files/patch-usr_lib_byobu_battery
>#	byobu/files/patch-usr_lib_byobu_load__average
>#	byobu/files/patch-usr_lib_byobu_memory
>#	byobu/files/patch-usr_lib_byobu_ip__address
>#	byobu/files/patch-usr_lib_byobu_reboot__required
>#	byobu/Makefile
>#	byobu/pkg-descr
>#
>echo c - byobu
>mkdir -p byobu > /dev/null 2>&1
>echo x - byobu/pkg-plist
>sed 's/^X//' >byobu/pkg-plist << '793aac13e5416858fc946dc20f2cd9b0'
>Xbin/byobu
>Xbin/byobu-config
>Xbin/byobu-ctrl-a
>Xbin/byobu-disable
>Xbin/byobu-disable-prompt
>Xbin/byobu-enable
>Xbin/byobu-enable-prompt
>Xbin/byobu-export
>Xbin/byobu-janitor
>Xbin/byobu-keybindings
>Xbin/byobu-launch
>Xbin/byobu-launcher
>Xbin/byobu-launcher-install
>Xbin/byobu-launcher-uninstall
>Xbin/byobu-layout
>Xbin/byobu-prompt
>Xbin/byobu-quiet
>Xbin/byobu-reconnect-sockets
>Xbin/byobu-screen
>Xbin/byobu-select-backend
>Xbin/byobu-select-profile
>Xbin/byobu-select-session
>Xbin/byobu-shell
>Xbin/byobu-silent
>Xbin/byobu-status
>Xbin/byobu-status-detail
>Xbin/byobu-tmux
>Xbin/byobu-ugraph
>Xbin/byobu-ulevel
>Xbin/col1
>Xbin/ctail
>Xbin/manifest
>Xbin/purge-old-kernels
>Xbin/vigpg
>Xbin/wifi-status
>X%%ETCDIR%%/backend
>X%%ETCDIR%%/socketdir
>Xlib/byobu/apport
>Xlib/byobu/arch
>Xlib/byobu/battery
>Xlib/byobu/color
>Xlib/byobu/cpu_count
>Xlib/byobu/cpu_freq
>Xlib/byobu/cpu_temp
>Xlib/byobu/custom
>Xlib/byobu/date
>Xlib/byobu/disk
>Xlib/byobu/disk_io
>Xlib/byobu/distro
>Xlib/byobu/ec2_cost
>Xlib/byobu/entropy
>Xlib/byobu/fan_speed
>Xlib/byobu/hostname
>Xlib/byobu/include/colors
>Xlib/byobu/include/common
>Xlib/byobu/include/config.py
>Xlib/byobu/include/constants
>Xlib/byobu/include/cycle-status
>Xlib/byobu/include/dirs
>Xlib/byobu/include/ec2instancespricing.py
>Xlib/byobu/include/icons
>Xlib/byobu/include/mondrian
>Xlib/byobu/include/notify_osd
>Xlib/byobu/include/select-session.py
>Xlib/byobu/include/shutil
>Xlib/byobu/include/tmux-detach-all-but-current-client
>Xlib/byobu/include/tmux-send-command-to-all-panes
>Xlib/byobu/include/tmux-send-command-to-all-windows
>Xlib/byobu/include/toggle-utf8
>Xlib/byobu/ip_address
>Xlib/byobu/load_average
>Xlib/byobu/logo
>Xlib/byobu/mail
>Xlib/byobu/memory
>Xlib/byobu/menu
>Xlib/byobu/network
>Xlib/byobu/processes
>Xlib/byobu/raid
>Xlib/byobu/rcs_cost
>Xlib/byobu/reboot_required
>Xlib/byobu/release
>Xlib/byobu/services
>Xlib/byobu/session
>Xlib/byobu/swap
>Xlib/byobu/time
>Xlib/byobu/time_binary
>Xlib/byobu/time_utc
>Xlib/byobu/trash
>Xlib/byobu/updates_available
>Xlib/byobu/uptime
>Xlib/byobu/users
>Xlib/byobu/whoami
>Xlib/byobu/wifi_quality
>Xman/man1/byobu-config.1.gz
>Xman/man1/byobu-ctrl-a.1.gz
>Xman/man1/byobu-disable-prompt.1.gz
>Xman/man1/byobu-disable.1.gz
>Xman/man1/byobu-enable-prompt.1.gz
>Xman/man1/byobu-enable.1.gz
>Xman/man1/byobu-export.1.gz
>Xman/man1/byobu-janitor.1.gz
>Xman/man1/byobu-keybindings.1.gz
>Xman/man1/byobu-launch.1.gz
>Xman/man1/byobu-launcher-install.1.gz
>Xman/man1/byobu-launcher-uninstall.1.gz
>Xman/man1/byobu-launcher.1.gz
>Xman/man1/byobu-layout.1.gz
>Xman/man1/byobu-prompt.1.gz
>Xman/man1/byobu-quiet.1.gz
>Xman/man1/byobu-reconnect-sockets.1.gz
>Xman/man1/byobu-screen.1.gz
>Xman/man1/byobu-select-backend.1.gz
>Xman/man1/byobu-select-profile.1.gz
>Xman/man1/byobu-select-session.1.gz
>Xman/man1/byobu-shell.1.gz
>Xman/man1/byobu-silent.1.gz
>Xman/man1/byobu-status-detail.1.gz
>Xman/man1/byobu-status.1.gz
>Xman/man1/byobu-tmux.1.gz
>Xman/man1/byobu-ugraph.1.gz
>Xman/man1/byobu-ulevel.1.gz
>Xman/man1/byobu.1.gz
>Xman/man1/col1.1.gz
>Xman/man1/ctail.1.gz
>Xman/man1/manifest.1.gz
>Xman/man1/purge-old-kernels.1.gz
>Xman/man1/vigpg.1.gz
>Xman/man1/wifi-status.1.gz
>X%%DATADIR%%/Z97-byobu.sh
>X%%DATADIR%%/desktop/byobu.desktop
>X%%DATADIR%%/desktop/byobu.desktop.old
>X%%DATADIR%%/keybindings/common
>X%%DATADIR%%/keybindings/f-keys
>X%%DATADIR%%/keybindings/f-keys.screen
>X%%DATADIR%%/keybindings/f-keys.screen.disable
>X%%DATADIR%%/keybindings/f-keys.tmux
>X%%DATADIR%%/keybindings/f-keys.tmux.disable
>X%%DATADIR%%/keybindings/mouse.tmux.disable
>X%%DATADIR%%/keybindings/mouse.tmux.enable
>X%%DATADIR%%/keybindings/none
>X%%DATADIR%%/keybindings/tmux-screen-keys.conf
>X%%DATADIR%%/pixmaps/byobu.svg
>X%%DATADIR%%/profiles/NONE
>X%%DATADIR%%/profiles/bashrc
>X%%DATADIR%%/profiles/byoburc
>X%%DATADIR%%/profiles/common
>X%%DATADIR%%/profiles/dircolors
>X%%DATADIR%%/profiles/screenrc
>X%%DATADIR%%/profiles/tmux
>X%%DATADIR%%/profiles/tmuxrc
>X%%DATADIR%%/status/status
>X%%DATADIR%%/status/statusrc
>X%%DATADIR%%/tests/byobu-time-notifications
>X%%DATADIR%%/windows/common
>Xshare/dbus-1/services/us.kirkland.terminals.byobu.service
>X%%PORTDOCS%%%%DOCSDIR%%/help.screen.txt
>X%%PORTDOCS%%%%DOCSDIR%%/help.tmux.txt
>793aac13e5416858fc946dc20f2cd9b0
>echo x - byobu/pkg-message
>sed 's/^X//' >byobu/pkg-message << '3ff95138b3cd7b6e29c9b858d6700122'
>X======================================================================
>X
>Xbyobu requires linprocfs(5) mounted on /compat/linux/proc
>X
>XIf you have not done it yet, please do the following:
>X
>X	mount -t linprocfs linproc /compat/linux/proc
>X
>XTo make it permanent, you need the following line in /etc/fstab:
>X
>X	linproc  /compat/linux/proc  linprocfs  rw,late  0 0
>X
>X======================================================================
>3ff95138b3cd7b6e29c9b858d6700122
>echo x - byobu/distinfo
>sed 's/^X//' >byobu/distinfo << '13b4b7c564b5ada0db36dcca8dee139e'
>XTIMESTAMP = 1497841950
>XSHA256 (byobu_5.119.orig.tar.gz) = 4b092ca12d3a33e89d84cc90c4a41af2ba8697d48e26080a45d64d6b7800ca77
>XSIZE (byobu_5.119.orig.tar.gz) = 664949
>13b4b7c564b5ada0db36dcca8dee139e
>echo c - byobu/files
>mkdir -p byobu/files > /dev/null 2>&1
>echo x - byobu/files/patch-usr_lib_byobu_network
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_network << '2675c9ab6865abea3e5bcab06e6b53c1'
>X--- usr/lib/byobu/network.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/network
>X@@ -41,7 +41,7 @@ __network() {
>X 		cache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/network.$i"
>X 		[ -r "$cache" ] && read x1 < "$cache" || tx1=0
>X 		local iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed
>X-		cat /proc/net/dev > "$cache".dev
>X+		cat /compat/linux/proc/net/dev > "$cache".dev
>X 		while read iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed; do
>X 			case "$iface" in
>X 				${interface}:)
>2675c9ab6865abea3e5bcab06e6b53c1
>echo x - byobu/files/patch-usr_lib_byobu_cpu__freq
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_cpu__freq << 'b6ab67dcc73f1db5188ee8aa55d21711'
>X--- usr/lib/byobu/cpu_freq.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/cpu_freq
>X@@ -20,7 +20,7 @@
>X #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>X 
>X __cpu_freq_detail() {
>X-	cat /proc/cpuinfo
>X+	cat /compat/linux/proc/cpuinfo
>X }
>X 
>X __cpu_freq() {
>X@@ -29,13 +29,13 @@ __cpu_freq() {
>X 		read hz < /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
>X 		fpdiv $hz "1000000" 1 # 1Ghz
>X 		freq="$_RET"
>X-	elif [ -r "/proc/cpuinfo" ]; then
>X-		if egrep -q -s -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo; then
>X-			freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }')
>X+	elif [ -r "/compat/linux/proc/cpuinfo" ]; then
>X+		if egrep -q -s -i -m 1 "^cpu MHz|^clock" /compat/linux/proc/cpuinfo; then
>X+			freq=$(egrep -i -m 1 "^cpu MHz|^clock" /compat/linux/proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }')
>X 		else
>X 			# Must scale frequency by number of processors, if counting bogomips
>X-			count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
>X-			freq=$(egrep -i -m 1 "^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ print $2 }')
>X+			count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /compat/linux/proc/cpuinfo)
>X+			freq=$(egrep -i -m 1 "^bogomips" /compat/linux/proc/cpuinfo | awk -F"[:.]" '{ print $2 }')
>X 			freq=$(printf "%s %s" "$freq" "$count" | awk '{printf "%01.1f\n", $1/$2/1000}')
>X 		fi
>X 	elif hz=$(sysctl -n hw.cpufrequency 2>/dev/null); then
>b6ab67dcc73f1db5188ee8aa55d21711
>echo x - byobu/files/patch-usr_lib_byobu_entropy
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_entropy << '93979ff25a553d78d787521124581ac1'
>X--- usr/lib/byobu/entropy.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/entropy
>X@@ -19,12 +19,12 @@
>X #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>X 
>X __entropy_detail() {
>X-	cat /proc/sys/kernel/random/entropy_avail 2>/dev/null
>X+	cat /compat/linux/proc/sys/kernel/random/entropy_avail 2>/dev/null
>X }
>X 
>X __entropy() {
>X-	if [ -r /proc/sys/kernel/random/entropy_avail ]; then
>X-		local e=$(cat /proc/sys/kernel/random/entropy_avail)
>X+	if [ -r /compat/linux/proc/sys/kernel/random/entropy_avail ]; then
>X+		local e=$(cat /compat/linux/proc/sys/kernel/random/entropy_avail)
>X 		[ -n "$e" ] || return
>X 		color K Y; printf "e%s" "$e"; color --
>X 	fi
>93979ff25a553d78d787521124581ac1
>echo x - byobu/files/patch-usr_lib_byobu_ec2__cost
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_ec2__cost << 'a946e95ef57d14c73fae74c7feb44ece'
>X--- usr/lib/byobu/ec2_cost.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/ec2_cost
>X@@ -56,8 +56,8 @@ __ec2_cost() {
>X 	file_to_stat="/etc/hostname"
>X 	hours=$(((`date +%s` - `stat --printf %Y $file_to_stat`) / 60 / 60 + 1))
>X 	# Auto detect network interface
>X-	[ -r "/proc/net/route" ] || return
>X-	interface=$(tail -n1 /proc/net/route  | awk '{print $1}')
>X+	[ -r "/compat/linux/proc/net/route" ] || return
>X+	interface=$(tail -n1 /compat/linux/proc/net/route  | awk '{print $1}')
>X 	local iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed
>X 	while read iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed; do
>X 		case "$iface" in
>X@@ -78,7 +78,7 @@ __ec2_cost() {
>X 			rx_gb=${rbytes}
>X 			break
>X 		fi
>X-	done < /proc/net/dev
>X+	done < /compat/linux/proc/net/dev
>X 	tx_gb=$(printf "%s" ${tx_gb} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }')
>X 	rx_gb=$(printf "%s" ${rx_gb} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }')
>X 	network_cost=`printf "%s %s %s %s" "$tx_gb" "$TX_RATE" "$rx_gb" "$RX_RATE" | awk '{printf "%f %f", $1*$2, $3*$4}' | awk '{printf "%f", $1 + $2}'`
>a946e95ef57d14c73fae74c7feb44ece
>echo x - byobu/files/patch-usr_lib_byobu_swap
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_swap << '57095978e3d709e055fe2f32bc745425'
>X--- usr/lib/byobu/swap.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/swap
>X@@ -20,7 +20,7 @@
>X #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>X 
>X __swap_detail() {
>X-	cat /proc/meminfo
>X+	cat /compat/linux/proc/meminfo
>X }
>X 
>X __swap() {
>X@@ -34,7 +34,7 @@ __swap() {
>X 			continue
>X 		fi
>X 		[ -n "$stotal" -a -n "$sfree" ] && break;
>X-	done < /proc/meminfo
>X+	done < /compat/linux/proc/meminfo
>X 	if [ "${stotal:-0}" = "0" ]; then
>X 		printf ""
>X 		rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/swap"
>57095978e3d709e055fe2f32bc745425
>echo x - byobu/files/patch-usr_lib_byobu_cpu__count
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_cpu__count << '5d6cc1c2fcda7f3e7bc2f1d548e8ca5d'
>X--- usr/lib/byobu/cpu_count.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/cpu_count
>X@@ -20,12 +20,12 @@
>X #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>X 
>X __cpu_count_detail() {
>X-	grep -i "^model name" /proc/cpuinfo
>X+	grep -i "^model name" /compat/linux/proc/cpuinfo
>X }
>X 
>X __cpu_count() {
>X 	local c
>X-	c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
>X+	c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /compat/linux/proc/cpuinfo)
>X 	[ "$c" = "1" ] || printf "%sx" "$c"
>X }
>X 
>5d6cc1c2fcda7f3e7bc2f1d548e8ca5d
>echo x - byobu/files/patch-usr_lib_byobu_disk
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_disk << '797e946d569caf00da9048b6de808e69'
>X--- usr/lib/byobu/disk.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/disk
>X@@ -20,7 +20,7 @@
>X #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>X 
>X __disk_detail() {
>X-	df -h -P
>X+	df -h
>X }
>X 
>X __disk() {
>X@@ -28,11 +28,11 @@ __disk() {
>X 	# Default to /, but let users override
>X 	[ -z "$MONITORED_DISK" ] && MP="/" || MP="$MONITORED_DISK"
>X 	case $MP in
>X-		/dev/*) MP=$(awk '$1 == m { print $2; exit(0); }' "m=$MP" /proc/mounts);;
>X+		/dev/*) MP=$(awk '$1 == m { print $2; exit(0); }' "m=$MP" /compat/linux/proc/mounts);;
>X 	esac
>X 	# this could be done faster with 'stat --file-system --format'
>X 	# but then we'd have to do blocks -> human units ourselves
>X-	out=$({ df -h -P "$MP" 2>/dev/null || df -h "$MP"; } | awk 'END { printf("%s %s", $2, $5); }')
>X+	out=$({ df -h "$MP" 2>/dev/null || df -h "$MP"; } | awk 'END { printf("%s %s", $2, $5); }')
>X 	set -- ${out}
>X 	size=${1}; pct=${2};
>X 	unit=${size#${size%?}} # get the unit (last char)
>797e946d569caf00da9048b6de808e69
>echo x - byobu/files/patch-usr_lib_byobu_raid
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_raid << 'ac2ef121adb880b99b34245cee732822'
>X--- usr/lib/byobu/raid.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/raid
>X@@ -20,7 +20,7 @@
>X #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>X 
>X __raid_detail() {
>X-	[ -r /proc/mdstat ] && cat /proc/mdstat || true
>X+	[ -r /compat/linux/proc/mdstat ] && cat /compat/linux/proc/mdstat || true
>X }
>X 
>X __raid() {
>X@@ -37,7 +37,7 @@ __raid() {
>X 				msg="$msg,$p"
>X 			;;
>X 		esac
>X-	done < /proc/mdstat
>X+	done < /compat/linux/proc/mdstat
>X 	if [ -n "$msg" ]; then
>X 		color B w r; printf "%s" "$msg"; color --
>X 	elif [ -e "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/raid" ]; then
>ac2ef121adb880b99b34245cee732822
>echo x - byobu/files/patch-usr_lib_byobu_fan__speed
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_fan__speed << 'f1bc0a49a7d1660605f85c8d9afecb6c'
>X--- usr/lib/byobu/fan_speed.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/fan_speed
>X@@ -38,9 +38,9 @@ __fan_speed() {
>X 	done
>X 
>X 	# But others (e.g. Dell Inspirons) seem to be here:
>X-	if [ -r /proc/i8k ]; then
>X+	if [ -r /compat/linux/proc/i8k ]; then
>X 		local line=""
>X-		read line < /proc/i8k
>X+		read line < /compat/linux/proc/i8k
>X 		set -- $line
>X 		for speed in $7 $8; do
>X 			if [ -n "$speed" ] && [ "$speed" -gt 0 ]; then
>f1bc0a49a7d1660605f85c8d9afecb6c
>echo x - byobu/files/patch-usr_lib_byobu_processes
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_processes << '3de7f6a5ccbc3c227572d08cdbd96a6d'
>X--- usr/lib/byobu/processes.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/processes
>X@@ -25,8 +25,8 @@ __processes_detail() {
>X 
>X __processes() {
>X 	local count=
>X-	if [ -r /proc ]; then
>X-		count=$(ls -d /proc/[0-9]* 2>/dev/null| wc -l)
>X+	if [ -r /compat/linux/proc ]; then
>X+		count=$(ls -d /compat/linux/proc/[0-9]* 2>/dev/null| wc -l)
>X 	else
>X 		count=$(ps -ef | wc -l | awk '{print $1}')
>X 	fi
>3de7f6a5ccbc3c227572d08cdbd96a6d
>echo x - byobu/files/patch-usr_lib_byobu_uptime
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_uptime << 'dfa3d1430c75ba936ca80cd4fa7a5151'
>X--- usr/lib/byobu/uptime.orig	2016-05-31 14:48:13 UTC
>X+++ usr/lib/byobu/uptime
>X@@ -27,8 +27,8 @@ __uptime_detail() {
>X 
>X __uptime() {
>X 	local u= idle= str=
>X-	if [ -r /proc/uptime ]; then
>X-		read u idle < /proc/uptime
>X+	if [ -r /compat/linux/proc/uptime ]; then
>X+		read u idle < /compat/linux/proc/uptime
>X 		u=${u%.*}
>X 	elif [ -x /usr/sbin/sysctl ]; then
>X 		# MacOS support
>dfa3d1430c75ba936ca80cd4fa7a5151
>echo x - byobu/files/patch-usr_lib_byobu_rcs__cost
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_rcs__cost << '50cdc8061dcae6ba3891c25b2faa3398'
>X--- usr/lib/byobu/rcs_cost.orig	2016-01-14 12:15:11 UTC
>X+++ usr/lib/byobu/rcs_cost
>X@@ -40,7 +40,7 @@ __rcs_cost() {
>X 	# 15872MB       $0.960/h
>X 
>X 	# Instance memory
>X-	memory=`grep "^MemTotal:" /proc/meminfo | awk '{print $2}'`
>X+	memory=`grep "^MemTotal:" /compat/linux/proc/meminfo | awk '{print $2}'`
>X 
>X 	# Round memory down to the nearest multiple of 64MB
>X 	memory=$((${memory} - (${memory} % (64 * 1024))))
>X@@ -59,8 +59,8 @@ __rcs_cost() {
>X 	TX_RATE="0.22"
>X 
>X 	# Auto detect network interface
>X-	[ -r "/proc/net/route" ] || return
>X-	IF=$(tail -n1 /proc/net/route  | awk '{print $1}')
>X+	[ -r "/compat/linux/proc/net/route" ] || return
>X+	IF=$(tail -n1 /compat/linux/proc/net/route  | awk '{print $1}')
>X 
>X 	ifconfig_out=`LC_ALL=C /sbin/ifconfig "$IF"`
>X 
>50cdc8061dcae6ba3891c25b2faa3398
>echo x - byobu/files/patch-usr_lib_byobu_cpu__temp
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_cpu__temp << 'cfcba607065fa0d8e3c02430ff00fb8a'
>X--- usr/lib/byobu/cpu_temp.orig	2016-07-29 16:53:37 UTC
>X+++ usr/lib/byobu/cpu_temp
>X@@ -21,7 +21,7 @@
>X 
>X __cpu_temp_detail() {
>X 	local i
>X-	for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/device/temp*_input /sys/class/hwmon/hwmon*/temp*_input /proc/acpi/ibm/thermal /proc/acpi/thermal_zone/*/temperature /sys/class/thermal/thermal_zone*/temp; do
>X+	for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/device/temp*_input /sys/class/hwmon/hwmon*/temp*_input /compat/linux/proc/acpi/ibm/thermal /compat/linux/proc/acpi/thermal_zone/*/temperature /sys/class/thermal/thermal_zone*/temp; do
>X 		[ -r "$i" ] || continue
>X 		printf "%s\n" "$i:"
>X 		cat "$i"/*
>X@@ -30,7 +30,7 @@ __cpu_temp_detail() {
>X 
>X __cpu_temp() {
>X 	local i t unit
>X-	for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/device/temp*_input /sys/class/hwmon/hwmon*/temp*_input /proc/acpi/ibm/thermal /proc/acpi/thermal_zone/*/temperature /sys/class/thermal/thermal_zone*/temp; do
>X+	for i in $MONITORED_TEMP /sys/class/hwmon/hwmon*/device/temp*_input /sys/class/hwmon/hwmon*/temp*_input /compat/linux/proc/acpi/ibm/thermal /compat/linux/proc/acpi/thermal_zone/*/temperature /sys/class/thermal/thermal_zone*/temp; do
>X 		case "$i" in
>X 			*temp*_input|*thermal_zone*/temp)
>X 				[ -s "$i" ] && read t < "$i" && t=$(($t/1000))
>cfcba607065fa0d8e3c02430ff00fb8a
>echo x - byobu/files/patch-usr_lib_byobu_battery
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_battery << '78f767080d5b0703890e27b5421dcc9c'
>X--- usr/lib/byobu/battery.orig	2016-09-15 19:22:48 UTC
>X+++ usr/lib/byobu/battery
>X@@ -22,7 +22,7 @@
>X 
>X __battery_detail() {
>X 	local bat
>X-	for bat in /proc/acpi/battery/*; do
>X+	for bat in /compat/linux/proc/acpi/battery/*; do
>X 		cat "$bat/info"
>X 		cat "$bat/state"
>X 	done
>X@@ -33,7 +33,7 @@ __battery() {
>X 	local bat line present sign state percent full rem color bcolor
>X 	# Linux support
>X 	present=""; full="0"; rem="0"; state=""
>X-	for bat in $BATTERY /sys/class/power_supply/* /proc/acpi/battery/*; do
>X+	for bat in $BATTERY /sys/class/power_supply/* /compat/linux/proc/acpi/battery/*; do
>X 		case "$bat" in
>X 			/sys/*)
>X 				if [ -r "$bat/uevent" ]; then
>X@@ -51,7 +51,7 @@ __battery() {
>X 					[ "$POWER_SUPPLY_STATUS" != "Unknown" ] && state="$POWER_SUPPLY_STATUS"
>X 				fi
>X 			;;
>X-			/proc/*)
>X+			/compat/linux/proc/*)
>X 				[ -f "$bat/info" ] || continue
>X 				while read line; do
>X 					set -- ${line}
>78f767080d5b0703890e27b5421dcc9c
>echo x - byobu/files/patch-usr_lib_byobu_load__average
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_load__average << '05a301a12d28648b50aac60c81a99a6b'
>X--- usr/lib/byobu/load_average.orig	2016-04-07 22:05:52 UTC
>X+++ usr/lib/byobu/load_average
>X@@ -20,12 +20,12 @@
>X #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>X 
>X __load_average_detail() {
>X-	cat /proc/loadavg
>X+	cat /compat/linux/proc/loadavg
>X }
>X 
>X __load_average() {
>X-	if [ -r "/proc/loadavg" ]; then
>X-		read one five fifteen other < /proc/loadavg
>X+	if [ -r "/compat/linux/proc/loadavg" ]; then
>X+		read one five fifteen other < /compat/linux/proc/loadavg
>X 	else
>X 		one=$(uptime | sed -e "s/.*://" | awk '{print $1}')
>X 	fi
>05a301a12d28648b50aac60c81a99a6b
>echo x - byobu/files/patch-usr_lib_byobu_memory
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_memory << 'feb50f9abf92bc364bd0a889972c46f3'
>X--- usr/lib/byobu/memory.orig	2016-09-15 19:22:48 UTC
>X+++ usr/lib/byobu/memory
>X@@ -26,7 +26,7 @@ __memory_detail() {
>X __memory() {
>X 	local free="" total="" buffers="" cached=""
>X 	local kb_main_used=0 buffers_plus_cached=0 fo_buffers=0 fo_cached=0
>X-	if [ -r /proc/meminfo ]; then
>X+	if [ -r /compat/linux/proc/meminfo ]; then
>X 		while read tok val unit; do
>X 			case "$tok" in
>X 				MemTotal:) total=${val};;
>X@@ -35,7 +35,7 @@ __memory() {
>X 				Cached:) cached=${val};;
>X 			esac
>X 			[ -n "${free}" -a -n "${total}" -a -n "${buffers}" -a -n "${cached}" ] && break;
>X-		done < /proc/meminfo
>X+		done < /compat/linux/proc/meminfo
>X 	elif eval $BYOBU_TEST vm_stat >/dev/null 2>&1; then
>X 		# MacOS support
>X 		# calculation borrowed from http://apple.stackexchange.com/a/48195/18857
>feb50f9abf92bc364bd0a889972c46f3
>echo x - byobu/files/patch-usr_lib_byobu_ip__address
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_ip__address << '5ac67426a4531d5ea9a4f42e700dd895'
>X--- usr/lib/byobu/ip_address.orig	2016-09-15 19:22:48 UTC
>X+++ usr/lib/byobu/ip_address
>X@@ -34,7 +34,7 @@ __ip_address() {
>X 		interface="$MONITORED_NETWORK"
>X 	else
>X 		case "$IPV6" in
>X-			1|true|yes) interface=$(awk '$10 != "lo" { iface=$10 ; }; END { print iface; }' /proc/net/ipv6_route);;
>X+			1|true|yes) interface=$(awk '$10 != "lo" { iface=$10 ; }; END { print iface; }' /compat/linux/proc/net/ipv6_route);;
>X 			*) get_network_interface; interface="$_RET";;
>X 		esac
>X 	fi
>5ac67426a4531d5ea9a4f42e700dd895
>echo x - byobu/files/patch-usr_lib_byobu_reboot__required
>sed 's/^X//' >byobu/files/patch-usr_lib_byobu_reboot__required << 'b97008dba887de6699beddf543e4ef4b'
>X--- usr/lib/byobu/reboot_required.orig	2016-06-13 11:26:23 UTC
>X+++ usr/lib/byobu/reboot_required
>X@@ -46,7 +46,7 @@ __reboot_required() {
>X 				break
>X 			;;
>X 		esac
>X-	done < /proc/modules
>X+	done < /compat/linux/proc/modules
>X 	if [ -e "$REBOOT_FLAG" ]; then
>X 		if [ "$livepatched" = "1" ]; then
>X 			color k G; printf "$ICON_REBOOT"; color --;
>b97008dba887de6699beddf543e4ef4b
>echo x - byobu/Makefile
>sed 's/^X//' >byobu/Makefile << 'f42c5794967f1b5003315dd7e2645b1b'
>X# Created by: Gea-Suan Lin <gslin@gslin.org>
>X# $FreeBSD: head/sysutils/byobu/Makefile 444656 2017-06-29 18:14:07Z ultima $
>X
>XPORTNAME=	byobu
>XPORTVERSION=	5.119
>XCATEGORIES=	sysutils
>XMASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
>XDISTNAME=	${PORTNAME}_${PORTVERSION}.orig
>X
>XMAINTAINER=	amutu@amutu.com
>XCOMMENT=	Profile and configuration utilities for GNU Screen
>X
>XLICENSE=	GPLv3
>XLICENSE_FILE=	${WRKSRC}/COPYING
>X
>XRUN_DEPENDS=	screen:sysutils/screen \
>X		bash:shells/bash
>X
>XGNU_CONFIGURE=	yes
>XUSES=		autoreconf python shebangfix
>XSHEBANG_FILES=	usr/lib/byobu/include/notify_osd
>XWRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>X
>XOPTIONS_DEFINE=	DOCS
>X
>XNO_ARCH=	yes
>X
>Xpost-patch:
>X	${FIND} ${WRKSRC} -type f | ${XARGS} \
>X		${REINPLACE_CMD} \
>X			-e "s@/bin/bash@${LOCALBASE}/bin/bash@" \
>X			-e "s@/usr/bin/python@${PYTHON_CMD}@"
>X	${REINPLACE_CMD} -e 's,@sysconfdir@/profile.d,$$(datadir)/@PACKAGE@,' \
>X		${WRKSRC}/etc/profile.d/Makefile.am
>X
>X.include <bsd.port.mk>
>f42c5794967f1b5003315dd7e2645b1b
>echo x - byobu/pkg-descr
>sed 's/^X//' >byobu/pkg-descr << '7d919f26eb3f6108cbd3980d96d43277'
>XByobu is a Japanese term for decorative, multi-panel screens that serve as
>Xfolding room dividers. As an open source project, Byobu is an elegant
>Xenhancement of the otherwise functional, plain, practical GNU Screen. Byobu
>Xincludes an enhanced profile and configuration utilities for the GNU screen
>Xwindow manager, such as toggle-able system status notifications.
>X
>XWWW: http://www.byobu.co
>7d919f26eb3f6108cbd3980d96d43277
>exit
>

Actions: View

Attachments on bug 202367: 159928 | 185064 | 185066 | 185089