https://bugs.contribs.org/show_bug.cgi?id=11190
--- Comment #5 from John Crisp <[email protected]> ---
The reason it fails is a fault in this patch due to the way things get linked
during build.
phpki-0.82-fix-dates.patch
This section should be removed.
diff -ruN phpki.old/phpki-0.82/setup.php-presetup
phpki/phpki-0.82/setup.php-presetup
--- phpki.old/phpki-0.82/setup.php-presetup 2018-11-17 14:06:06.548603290
+0100
+++ phpki/phpki-0.82/setup.php-presetup 2020-03-03 15:44:01.215746367 +0100
@@ -102,6 +102,11 @@
if (! $passwd_file) $er .= 'Missing User Password File Location';
if (! $store_dir) $er .= 'Missing Storage Directory<br>';
+ $countrycode = strtoupper($country);
+
+ if (! preg_match("/\b[A-Z][A-Z]\b/", $countrycode, $match) ) {
+ $er .= 'Country Code must be ISO 3166 two letters <br>';
+ }
if ( $passwd && strlen($passwd) < 8 )
$er .= 'Certificate password is too short.<br>';
@@ -762,9 +767,8 @@
<td><select name=expiry>
<?
- for ( $i = 5 ; $i < 20 ; $i+=5 ) {
- print "<option value=$i " . ($expiry == $i ?
"selected='selected
-'" : "") . " >$i Years</option>\n" ;
+ for ( $i = 5 ; $i <= 20 ; $i+=5 ) {
+ print "<option value=$i " . ($expiry == $i ?
"selected='selected'" : "") . " >$i Years</option>\n" ;
}
?>
@@ -780,8 +784,7 @@
<?
for ( $i = 512 ; $i <= 4096 ; $i+=512 ) {
- print "<option value=$i " . ($keysize == $i ?
"selected='selected
-'" : "") . " >$i bits</option>\n" ;
+ print "<option value=$i " . ($keysize == $i ?
"selected='selected'" : "") . " >$i bits</option>\n" ;
}
?>
So I updated the spec file with a new version, then did
make commit;make tag;make build
* Tue Nov 24 2020 John Crisp <[email protected]> 0.82-24.sme
- Fix error in phpki-0.82-fix-dates.patch
Seems to have fixed it!!!
--
You are receiving this mail because:
You are the QA Contact for the bug._______________________________________________
Mail for each SME Contribs bug report
To unsubscribe, e-mail [email protected]
Searchable archive at https://lists.contribs.org/mailman/public/contribteam/
