Attachment 199299 Details for Bug 233216 – v3 of patch with removed patches

[patch] v3 of patch with removed patches

byobu_5.127_v3.patch (text/plain), 24.25 KB, created by Fernando Apesteguía on 2018-11-17 18:56:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2018-11-17 18:56:18 UTC

Size: 24.25 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 485188)
>+++ Makefile	(working copy)
>@@ -2,13 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	byobu
>-PORTVERSION=	5.119
>-PORTREVISION=	1
>+PORTVERSION=	5.127
> CATEGORIES=	sysutils
> MASTER_SITES=	http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
> DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	jcoffman@openfire.io
> COMMENT=	Profile and configuration utilities for GNU Screen
> 
> LICENSE=	GPLv3
>@@ -17,10 +16,14 @@
> RUN_DEPENDS=	screen:sysutils/screen \
> 		bash:shells/bash
> 
>-GNU_CONFIGURE=	yes
> USES=		autoreconf python shebangfix
>-SHEBANG_FILES=	usr/lib/byobu/include/notify_osd
>+
>+SHEBANG_FILES=	usr/lib/byobu/include/notify_osd \
>+		usr/lib/byobu/include/config.py.in \
>+		usr/lib/byobu/include/select-session.py
>+
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+GNU_CONFIGURE=	yes
> 
> OPTIONS_DEFINE=	DOCS
> 
>@@ -33,5 +36,7 @@
> 			-e "s@/usr/bin/python@${PYTHON_CMD}@"
> 	${REINPLACE_CMD} -e 's,@sysconfdir@/profile.d,$$(datadir)/@PACKAGE@,' \
> 		${WRKSRC}/etc/profile.d/Makefile.am
>+	${FIND} ${WRKSRC}/usr/lib/byobu -type f -maxdepth 1 | ${XARGS} \
>+		${REINPLACE_CMD} -e 's:/proc:/compat/linux/proc:g'
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 485188)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1497841950
>-SHA256 (byobu_5.119.orig.tar.gz) = 4b092ca12d3a33e89d84cc90c4a41af2ba8697d48e26080a45d64d6b7800ca77
>-SIZE (byobu_5.119.orig.tar.gz) = 664949
>+TIMESTAMP = 1542171398
>+SHA256 (byobu_5.127.orig.tar.gz) = 4bafc7cb69ff5b0ab6998816d58cd1ef7175e5de75abc1dd7ffd6d5288a4f63b
>+SIZE (byobu_5.127.orig.tar.gz) = 755529
>Index: files/patch-usr_lib_byobu_battery
>===================================================================
>--- files/patch-usr_lib_byobu_battery	(revision 485188)
>+++ files/patch-usr_lib_byobu_battery	(nonexistent)
>@@ -1,29 +0,0 @@
>---- usr/lib/byobu/battery.orig	2016-09-15 19:22:48 UTC
>-+++ usr/lib/byobu/battery
>-@@ -22,7 +22,7 @@
>- 
>- __battery_detail() {
>- 	local bat
>--	for bat in /proc/acpi/battery/*; do
>-+	for bat in /compat/linux/proc/acpi/battery/*; do
>- 		cat "$bat/info"
>- 		cat "$bat/state"
>- 	done
>-@@ -33,7 +33,7 @@ __battery() {
>- 	local bat line present sign state percent full rem color bcolor
>- 	# Linux support
>- 	present=""; full="0"; rem="0"; state=""
>--	for bat in $BATTERY /sys/class/power_supply/* /proc/acpi/battery/*; do
>-+	for bat in $BATTERY /sys/class/power_supply/* /compat/linux/proc/acpi/battery/*; do
>- 		case "$bat" in
>- 			/sys/*)
>- 				if [ -r "$bat/uevent" ]; then
>-@@ -51,7 +51,7 @@ __battery() {
>- 					[ "$POWER_SUPPLY_STATUS" != "Unknown" ] && state="$POWER_SUPPLY_STATUS"
>- 				fi
>- 			;;
>--			/proc/*)
>-+			/compat/linux/proc/*)
>- 				[ -f "$bat/info" ] || continue
>- 				while read line; do
>- 					set -- ${line}
>
>Property changes on: files/patch-usr_lib_byobu_battery
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_cpu__count
>===================================================================
>--- files/patch-usr_lib_byobu_cpu__count	(revision 485188)
>+++ files/patch-usr_lib_byobu_cpu__count	(nonexistent)
>@@ -1,17 +0,0 @@
>---- usr/lib/byobu/cpu_count.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/cpu_count
>-@@ -20,12 +20,12 @@
>- #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>- 
>- __cpu_count_detail() {
>--	grep -i "^model name" /proc/cpuinfo
>-+	grep -i "^model name" /compat/linux/proc/cpuinfo
>- }
>- 
>- __cpu_count() {
>- 	local c
>--	c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
>-+	c=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /compat/linux/proc/cpuinfo)
>- 	[ "$c" = "1" ] || printf "%sx" "$c"
>- }
>- 
>
>Property changes on: files/patch-usr_lib_byobu_cpu__count
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_cpu__freq
>===================================================================
>--- files/patch-usr_lib_byobu_cpu__freq	(revision 485188)
>+++ files/patch-usr_lib_byobu_cpu__freq	(nonexistent)
>@@ -1,30 +0,0 @@
>---- usr/lib/byobu/cpu_freq.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/cpu_freq
>-@@ -20,7 +20,7 @@
>- #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>- 
>- __cpu_freq_detail() {
>--	cat /proc/cpuinfo
>-+	cat /compat/linux/proc/cpuinfo
>- }
>- 
>- __cpu_freq() {
>-@@ -29,13 +29,13 @@ __cpu_freq() {
>- 		read hz < /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
>- 		fpdiv $hz "1000000" 1 # 1Ghz
>- 		freq="$_RET"
>--	elif [ -r "/proc/cpuinfo" ]; then
>--		if egrep -q -s -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo; then
>--			freq=$(egrep -i -m 1 "^cpu MHz|^clock" /proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }')
>-+	elif [ -r "/compat/linux/proc/cpuinfo" ]; then
>-+		if egrep -q -s -i -m 1 "^cpu MHz|^clock" /compat/linux/proc/cpuinfo; then
>-+			freq=$(egrep -i -m 1 "^cpu MHz|^clock" /compat/linux/proc/cpuinfo | awk -F"[:.]" '{ printf "%01.1f", $2 / 1000 }')
>- 		else
>- 			# Must scale frequency by number of processors, if counting bogomips
>--			count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /proc/cpuinfo)
>--			freq=$(egrep -i -m 1 "^bogomips" /proc/cpuinfo | awk -F"[:.]" '{ print $2 }')
>-+			count=$(getconf _NPROCESSORS_ONLN 2>/dev/null || grep -ci "^processor" /compat/linux/proc/cpuinfo)
>-+			freq=$(egrep -i -m 1 "^bogomips" /compat/linux/proc/cpuinfo | awk -F"[:.]" '{ print $2 }')
>- 			freq=$(printf "%s %s" "$freq" "$count" | awk '{printf "%01.1f\n", $1/$2/1000}')
>- 		fi
>- 	elif hz=$(sysctl -n hw.cpufrequency 2>/dev/null); then
>
>Property changes on: files/patch-usr_lib_byobu_cpu__freq
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_cpu__temp
>===================================================================
>--- files/patch-usr_lib_byobu_cpu__temp	(revision 485188)
>+++ files/patch-usr_lib_byobu_cpu__temp	(nonexistent)
>@@ -1,20 +0,0 @@
>---- usr/lib/byobu/cpu_temp.orig	2016-07-29 16:53:37 UTC
>-+++ usr/lib/byobu/cpu_temp
>-@@ -21,7 +21,7 @@
>- 
>- __cpu_temp_detail() {
>- 	local i
>--	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
>-+	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
>- 		[ -r "$i" ] || continue
>- 		printf "%s\n" "$i:"
>- 		cat "$i"/*
>-@@ -30,7 +30,7 @@ __cpu_temp_detail() {
>- 
>- __cpu_temp() {
>- 	local i t unit
>--	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
>-+	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
>- 		case "$i" in
>- 			*temp*_input|*thermal_zone*/temp)
>- 				[ -s "$i" ] && read t < "$i" && t=$(($t/1000))
>
>Property changes on: files/patch-usr_lib_byobu_cpu__temp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_ec2__cost
>===================================================================
>--- files/patch-usr_lib_byobu_ec2__cost	(revision 485188)
>+++ files/patch-usr_lib_byobu_ec2__cost	(nonexistent)
>@@ -1,22 +0,0 @@
>---- usr/lib/byobu/ec2_cost.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/ec2_cost
>-@@ -56,8 +56,8 @@ __ec2_cost() {
>- 	file_to_stat="/etc/hostname"
>- 	hours=$(((`date +%s` - `stat --printf %Y $file_to_stat`) / 60 / 60 + 1))
>- 	# Auto detect network interface
>--	[ -r "/proc/net/route" ] || return
>--	interface=$(tail -n1 /proc/net/route  | awk '{print $1}')
>-+	[ -r "/compat/linux/proc/net/route" ] || return
>-+	interface=$(tail -n1 /compat/linux/proc/net/route  | awk '{print $1}')
>- 	local iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed
>- 	while read iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed; do
>- 		case "$iface" in
>-@@ -78,7 +78,7 @@ __ec2_cost() {
>- 			rx_gb=${rbytes}
>- 			break
>- 		fi
>--	done < /proc/net/dev
>-+	done < /compat/linux/proc/net/dev
>- 	tx_gb=$(printf "%s" ${tx_gb} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }')
>- 	rx_gb=$(printf "%s" ${rx_gb} | awk '{ printf "%f", $1 / 1024 / 1024 / 1024 }')
>- 	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}'`
>
>Property changes on: files/patch-usr_lib_byobu_ec2__cost
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_entropy
>===================================================================
>--- files/patch-usr_lib_byobu_entropy	(revision 485188)
>+++ files/patch-usr_lib_byobu_entropy	(nonexistent)
>@@ -1,18 +0,0 @@
>---- usr/lib/byobu/entropy.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/entropy
>-@@ -19,12 +19,12 @@
>- #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>- 
>- __entropy_detail() {
>--	cat /proc/sys/kernel/random/entropy_avail 2>/dev/null
>-+	cat /compat/linux/proc/sys/kernel/random/entropy_avail 2>/dev/null
>- }
>- 
>- __entropy() {
>--	if [ -r /proc/sys/kernel/random/entropy_avail ]; then
>--		local e=$(cat /proc/sys/kernel/random/entropy_avail)
>-+	if [ -r /compat/linux/proc/sys/kernel/random/entropy_avail ]; then
>-+		local e=$(cat /compat/linux/proc/sys/kernel/random/entropy_avail)
>- 		[ -n "$e" ] || return
>- 		color K Y; printf "e%s" "$e"; color --
>- 	fi
>
>Property changes on: files/patch-usr_lib_byobu_entropy
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_fan__speed
>===================================================================
>--- files/patch-usr_lib_byobu_fan__speed	(revision 485188)
>+++ files/patch-usr_lib_byobu_fan__speed	(nonexistent)
>@@ -1,14 +0,0 @@
>---- usr/lib/byobu/fan_speed.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/fan_speed
>-@@ -38,9 +38,9 @@ __fan_speed() {
>- 	done
>- 
>- 	# But others (e.g. Dell Inspirons) seem to be here:
>--	if [ -r /proc/i8k ]; then
>-+	if [ -r /compat/linux/proc/i8k ]; then
>- 		local line=""
>--		read line < /proc/i8k
>-+		read line < /compat/linux/proc/i8k
>- 		set -- $line
>- 		for speed in $7 $8; do
>- 			if [ -n "$speed" ] && [ "$speed" -gt 0 ]; then
>
>Property changes on: files/patch-usr_lib_byobu_fan__speed
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_ip__address
>===================================================================
>--- files/patch-usr_lib_byobu_ip__address	(revision 485188)
>+++ files/patch-usr_lib_byobu_ip__address	(nonexistent)
>@@ -1,11 +0,0 @@
>---- usr/lib/byobu/ip_address.orig	2016-09-15 19:22:48 UTC
>-+++ usr/lib/byobu/ip_address
>-@@ -34,7 +34,7 @@ __ip_address() {
>- 		interface="$MONITORED_NETWORK"
>- 	else
>- 		case "$IPV6" in
>--			1|true|yes) interface=$(awk '$10 != "lo" { iface=$10 ; }; END { print iface; }' /proc/net/ipv6_route);;
>-+			1|true|yes) interface=$(awk '$10 != "lo" { iface=$10 ; }; END { print iface; }' /compat/linux/proc/net/ipv6_route);;
>- 			*) get_network_interface; interface="$_RET";;
>- 		esac
>- 	fi
>
>Property changes on: files/patch-usr_lib_byobu_ip__address
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_load__average
>===================================================================
>--- files/patch-usr_lib_byobu_load__average	(revision 485188)
>+++ files/patch-usr_lib_byobu_load__average	(nonexistent)
>@@ -1,18 +0,0 @@
>---- usr/lib/byobu/load_average.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/load_average
>-@@ -20,12 +20,12 @@
>- #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>- 
>- __load_average_detail() {
>--	cat /proc/loadavg
>-+	cat /compat/linux/proc/loadavg
>- }
>- 
>- __load_average() {
>--	if [ -r "/proc/loadavg" ]; then
>--		read one five fifteen other < /proc/loadavg
>-+	if [ -r "/compat/linux/proc/loadavg" ]; then
>-+		read one five fifteen other < /compat/linux/proc/loadavg
>- 	else
>- 		one=$(uptime | sed -e "s/.*://" | awk '{print $1}')
>- 	fi
>
>Property changes on: files/patch-usr_lib_byobu_load__average
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_memory
>===================================================================
>--- files/patch-usr_lib_byobu_memory	(revision 485188)
>+++ files/patch-usr_lib_byobu_memory	(nonexistent)
>@@ -1,20 +0,0 @@
>---- usr/lib/byobu/memory.orig	2016-09-15 19:22:48 UTC
>-+++ usr/lib/byobu/memory
>-@@ -26,7 +26,7 @@ __memory_detail() {
>- __memory() {
>- 	local free="" total="" buffers="" cached=""
>- 	local kb_main_used=0 buffers_plus_cached=0 fo_buffers=0 fo_cached=0
>--	if [ -r /proc/meminfo ]; then
>-+	if [ -r /compat/linux/proc/meminfo ]; then
>- 		while read tok val unit; do
>- 			case "$tok" in
>- 				MemTotal:) total=${val};;
>-@@ -35,7 +35,7 @@ __memory() {
>- 				Cached:) cached=${val};;
>- 			esac
>- 			[ -n "${free}" -a -n "${total}" -a -n "${buffers}" -a -n "${cached}" ] && break;
>--		done < /proc/meminfo
>-+		done < /compat/linux/proc/meminfo
>- 	elif eval $BYOBU_TEST vm_stat >/dev/null 2>&1; then
>- 		# MacOS support
>- 		# calculation borrowed from http://apple.stackexchange.com/a/48195/18857
>
>Property changes on: files/patch-usr_lib_byobu_memory
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_network
>===================================================================
>--- files/patch-usr_lib_byobu_network	(revision 485188)
>+++ files/patch-usr_lib_byobu_network	(nonexistent)
>@@ -1,11 +0,0 @@
>---- usr/lib/byobu/network.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/network
>-@@ -41,7 +41,7 @@ __network() {
>- 		cache="$BYOBU_RUN_DIR/cache.$BYOBU_BACKEND/network.$i"
>- 		[ -r "$cache" ] && read x1 < "$cache" || tx1=0
>- 		local iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed
>--		cat /proc/net/dev > "$cache".dev
>-+		cat /compat/linux/proc/net/dev > "$cache".dev
>- 		while read iface rbytes rpackets rerrs rdrop rfifo rframe rcompressed rmulticast tbytes tpackets terrs tdrop tfifo tcolls tcarrier tcompressed; do
>- 			case "$iface" in
>- 				${interface}:)
>
>Property changes on: files/patch-usr_lib_byobu_network
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_processes
>===================================================================
>--- files/patch-usr_lib_byobu_processes	(revision 485188)
>+++ files/patch-usr_lib_byobu_processes	(nonexistent)
>@@ -1,13 +0,0 @@
>---- usr/lib/byobu/processes.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/processes
>-@@ -25,8 +25,8 @@ __processes_detail() {
>- 
>- __processes() {
>- 	local count=
>--	if [ -r /proc ]; then
>--		count=$(ls -d /proc/[0-9]* 2>/dev/null| wc -l)
>-+	if [ -r /compat/linux/proc ]; then
>-+		count=$(ls -d /compat/linux/proc/[0-9]* 2>/dev/null| wc -l)
>- 	else
>- 		count=$(ps -ef | wc -l | awk '{print $1}')
>- 	fi
>
>Property changes on: files/patch-usr_lib_byobu_processes
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_raid
>===================================================================
>--- files/patch-usr_lib_byobu_raid	(revision 485188)
>+++ files/patch-usr_lib_byobu_raid	(nonexistent)
>@@ -1,20 +0,0 @@
>---- usr/lib/byobu/raid.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/raid
>-@@ -20,7 +20,7 @@
>- #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>- 
>- __raid_detail() {
>--	[ -r /proc/mdstat ] && cat /proc/mdstat || true
>-+	[ -r /compat/linux/proc/mdstat ] && cat /compat/linux/proc/mdstat || true
>- }
>- 
>- __raid() {
>-@@ -37,7 +37,7 @@ __raid() {
>- 				msg="$msg,$p"
>- 			;;
>- 		esac
>--	done < /proc/mdstat
>-+	done < /compat/linux/proc/mdstat
>- 	if [ -n "$msg" ]; then
>- 		color B w r; printf "%s" "$msg"; color --
>- 	elif [ -e "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/raid" ]; then
>
>Property changes on: files/patch-usr_lib_byobu_raid
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_rcs__cost
>===================================================================
>--- files/patch-usr_lib_byobu_rcs__cost	(revision 485188)
>+++ files/patch-usr_lib_byobu_rcs__cost	(nonexistent)
>@@ -1,22 +0,0 @@
>---- usr/lib/byobu/rcs_cost.orig	2016-01-14 12:15:11 UTC
>-+++ usr/lib/byobu/rcs_cost
>-@@ -40,7 +40,7 @@ __rcs_cost() {
>- 	# 15872MB       $0.960/h
>- 
>- 	# Instance memory
>--	memory=`grep "^MemTotal:" /proc/meminfo | awk '{print $2}'`
>-+	memory=`grep "^MemTotal:" /compat/linux/proc/meminfo | awk '{print $2}'`
>- 
>- 	# Round memory down to the nearest multiple of 64MB
>- 	memory=$((${memory} - (${memory} % (64 * 1024))))
>-@@ -59,8 +59,8 @@ __rcs_cost() {
>- 	TX_RATE="0.22"
>- 
>- 	# Auto detect network interface
>--	[ -r "/proc/net/route" ] || return
>--	IF=$(tail -n1 /proc/net/route  | awk '{print $1}')
>-+	[ -r "/compat/linux/proc/net/route" ] || return
>-+	IF=$(tail -n1 /compat/linux/proc/net/route  | awk '{print $1}')
>- 
>- 	ifconfig_out=`LC_ALL=C /sbin/ifconfig "$IF"`
>- 
>
>Property changes on: files/patch-usr_lib_byobu_rcs__cost
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_reboot__required
>===================================================================
>--- files/patch-usr_lib_byobu_reboot__required	(revision 485188)
>+++ files/patch-usr_lib_byobu_reboot__required	(nonexistent)
>@@ -1,11 +0,0 @@
>---- usr/lib/byobu/reboot_required.orig	2016-06-13 11:26:23 UTC
>-+++ usr/lib/byobu/reboot_required
>-@@ -46,7 +46,7 @@ __reboot_required() {
>- 				break
>- 			;;
>- 		esac
>--	done < /proc/modules
>-+	done < /compat/linux/proc/modules
>- 	if [ -e "$REBOOT_FLAG" ]; then
>- 		if [ "$livepatched" = "1" ]; then
>- 			color k G; printf "$ICON_REBOOT"; color --;
>
>Property changes on: files/patch-usr_lib_byobu_reboot__required
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_swap
>===================================================================
>--- files/patch-usr_lib_byobu_swap	(revision 485188)
>+++ files/patch-usr_lib_byobu_swap	(nonexistent)
>@@ -1,20 +0,0 @@
>---- usr/lib/byobu/swap.orig	2016-04-07 22:05:52 UTC
>-+++ usr/lib/byobu/swap
>-@@ -20,7 +20,7 @@
>- #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
>- 
>- __swap_detail() {
>--	cat /proc/meminfo
>-+	cat /compat/linux/proc/meminfo
>- }
>- 
>- __swap() {
>-@@ -34,7 +34,7 @@ __swap() {
>- 			continue
>- 		fi
>- 		[ -n "$stotal" -a -n "$sfree" ] && break;
>--	done < /proc/meminfo
>-+	done < /compat/linux/proc/meminfo
>- 	if [ "${stotal:-0}" = "0" ]; then
>- 		printf ""
>- 		rm -f "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND/swap"
>
>Property changes on: files/patch-usr_lib_byobu_swap
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-usr_lib_byobu_uptime
>===================================================================
>--- files/patch-usr_lib_byobu_uptime	(revision 485188)
>+++ files/patch-usr_lib_byobu_uptime	(nonexistent)
>@@ -1,13 +0,0 @@
>---- usr/lib/byobu/uptime.orig	2016-05-31 14:48:13 UTC
>-+++ usr/lib/byobu/uptime
>-@@ -27,8 +27,8 @@ __uptime_detail() {
>- 
>- __uptime() {
>- 	local u= idle= str=
>--	if [ -r /proc/uptime ]; then
>--		read u idle < /proc/uptime
>-+	if [ -r /compat/linux/proc/uptime ]; then
>-+		read u idle < /compat/linux/proc/uptime
>- 		u=${u%.*}
>- 	elif [ -x /usr/sbin/sysctl ]; then
>- 		# MacOS support
>
>Property changes on: files/patch-usr_lib_byobu_uptime
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 485188)
>+++ pkg-plist	(working copy)
>@@ -47,7 +47,6 @@
> lib/byobu/disk
> lib/byobu/disk_io
> lib/byobu/distro
>-lib/byobu/ec2_cost
> lib/byobu/entropy
> lib/byobu/fan_speed
> lib/byobu/hostname
>@@ -57,7 +56,6 @@
> lib/byobu/include/constants
> lib/byobu/include/cycle-status
> lib/byobu/include/dirs
>-lib/byobu/include/ec2instancespricing.py
> lib/byobu/include/icons
> lib/byobu/include/mondrian
> lib/byobu/include/notify_osd
>@@ -76,7 +74,6 @@
> lib/byobu/network
> lib/byobu/processes
> lib/byobu/raid
>-lib/byobu/rcs_cost
> lib/byobu/reboot_required
> lib/byobu/release
> lib/byobu/services

Flags:

fernape: maintainer-approval?

Actions: View | Diff

Attachments on bug 233216: 199224 | 199225 | 199239 | 199298 | 199299