www/phpvirtualbox{,-legacy}: use one patch for both ports, remove "No newline at end of file" from patches
Forgot to commit this change in previous commit.
PR: 261498
Approved by: portmgr (blanket, fix run)
Fixes: c8ee986410 (PHP 8.2 support - "utf8_encode()")
MFH: 2024Q2
This commit is contained in:
@@ -22,7 +22,8 @@ DOS2UNIX_REGEX= .*\.(php|txt|js|css|html)
|
||||
WWWDIR= ${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
|
||||
ETCDIR= ${WWWDIR}
|
||||
|
||||
EXTRA_PATCHES+= ${.CURDIR}/../phpvirtualbox/files/patch-php8
|
||||
EXTRA_PATCHES+= ${.CURDIR}/../phpvirtualbox/files/patch-php8 \
|
||||
${.CURDIR}/../phpvirtualbox/files/patch-panes_mediumEncryptionPasswords.html
|
||||
|
||||
post-patch:
|
||||
@${MV} ${WRKSRC}/phpvirtualbox.conf ${WRKSRC}/phpvirtualbox-legacy.conf
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
--- panes/mediumEncryptionPasswords.html.orig 2017-07-27 16:54:58 UTC
|
||||
+++ panes/mediumEncryptionPasswords.html
|
||||
@@ -15,6 +15,7 @@
|
||||
<th class='translate' style='width:1%; text-align:center'>Status</th>
|
||||
<th class='translate' style='width:30%; text-align:center'>ID</th>
|
||||
<th class='translate'>Password</th>
|
||||
+ <th class='translate'>Clear on suspend</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id='vboxMediumEncryptionPasswordList'>
|
||||
@@ -37,9 +38,12 @@ function vboxMediumEncryptionPasswordAdd
|
||||
.append($('<td />')
|
||||
.append(
|
||||
valid ? '*****' :
|
||||
- $('<input />').attr({'type':'password','style':'width:95%'}).addClass('vboxText')
|
||||
+ $('<input />').attr({'type':'password','style':'width:90%'}).addClass('vboxText')
|
||||
)
|
||||
)
|
||||
+ .append($('<td />')
|
||||
+ .append($('<input />').attr({'type':'checkbox', 'checked':'checked'}))
|
||||
+ )
|
||||
.appendTo($('#vboxMediumEncryptionPasswordList'))
|
||||
}
|
||||
|
||||
@@ -55,7 +59,8 @@ function vboxMediumEncryptionPasswordsGe
|
||||
continue;
|
||||
encryptionPWs.push({
|
||||
'id': $(rowlist[i]).data('vboxEncryptionId'),
|
||||
- 'password': $(rowlist[i]).find('input').first().val()
|
||||
+ 'password': $(rowlist[i]).find('input[type="password"]').first().val(),
|
||||
+ 'clearOnSuspend': $(rowlist[i]).find('input[type="checkbox"]').first().is(':checked') ? '1' : '0'
|
||||
});
|
||||
|
||||
}
|
||||
@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa
|
||||
});
|
||||
return valid;
|
||||
}
|
||||
-</script>
|
||||
\ No newline at end of file
|
||||
+</script>
|
||||
@@ -32,10 +32,3 @@
|
||||
});
|
||||
|
||||
}
|
||||
@@ -75,4 +80,4 @@ function vboxMediumEncryptionPasswordsVa
|
||||
});
|
||||
return valid;
|
||||
}
|
||||
-</script>
|
||||
\ No newline at end of file
|
||||
+</script>
|
||||
|
||||
@@ -178,13 +178,6 @@
|
||||
|
||||
return $log;
|
||||
}
|
||||
@@ -5855,4 +5853,4 @@ class vboxconnector {
|
||||
|
||||
return @$rcodes['0x'.strtoupper(dechex($c))] . ' (0x'.strtoupper(dechex($c)).')';
|
||||
}
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
--- endpoints/screen.php.orig 2024-06-07 15:46:20 UTC
|
||||
+++ endpoints/screen.php
|
||||
@@ -87,13 +87,13 @@ try {
|
||||
|
||||
Reference in New Issue
Block a user