Attachment 199298 Details for Bug 233216 – byobu_5.127_v2.patch

[patch] byobu_5.127_v2.patch

byobu_5.127_v2.patch (text/plain), 5.45 KB, created by Fernando Apesteguía on 2018-11-17 18:15:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2018-11-17 18:15:55 UTC

Size: 5.45 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 485083)
>+++ Makefile	(working copy)
>@@ -2,13 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	byobu
>-PORTVERSION=	5.119
>+PORTVERSION=	5.127
> PORTREVISION=	1
> 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
>@@ -19,7 +19,7 @@
> 
> 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}
> 
> OPTIONS_DEFINE=	DOCS
>@@ -33,5 +33,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 485083)
>+++ 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_ec2__cost
>===================================================================
>--- files/patch-usr_lib_byobu_ec2__cost	(revision 485083)
>+++ 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_rcs__cost
>===================================================================
>--- files/patch-usr_lib_byobu_rcs__cost	(revision 485083)
>+++ 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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 485083)
>+++ 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

Actions: View | Diff

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