svn commit: r1912443 [2/2] - in /perl/embperl/trunk: ./ Embperl/ Embperl/Form/ Embperl/Form/Control/ Embperl/Syntax/ driver/ eg/ eg/web/ test/cmp/ test/html/ test/html/EmbperlObject/ test/html/match/
Modified: perl/embperl/trunk/test/html/sidurl/geturlsess.htm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/html/sidurl/geturlsess.htm?rev=1912443&r1=1912442&r2=1912443&view=diff == --- perl/embperl/trunk/test/html/sidurl/geturlsess.htm (original) +++ perl/embperl/trunk/test/html/sidurl/geturlsess.htm Thu Sep 21 03:39:10 2023 @@ -41,7 +41,7 @@ - [+ $ks[$row] +][+ $udat{$ks[$row] || ''} +] + [+ $ks[$row] +][+ 0+$udat{$ks[$row] || ''} +] @@ -55,7 +55,7 @@ -] -$mdat{cnt} = -[+ $mdat{cnt} +]- +$mdat{cnt} = -[+ 0+$mdat{cnt} +]- $udat{cnt} = -[+ $udat{cnt} +]- Modified: perl/embperl/trunk/test/html/upload.htm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test/html/upload.htm?rev=1912443&r1=1912442&r2=1912443&view=diff == --- perl/embperl/trunk/test/html/upload.htm (original) +++ perl/embperl/trunk/test/html/upload.htm Thu Sep 21 03:39:10 2023 @@ -8,7 +8,7 @@ use Data::Dumper ; !] Embperl Tests - File-Upload -[+ do { $cgiok = $CGI::VERSION > 2.45 ; @info = sort keys %{$fdat{-upload}} ; $cgiok?"@info":'Content-Disposition Content-Type' } +] +[+ do { $cgiok = $CGI::VERSION > 2.45; $cgi4 = $CGI::VERSION >= 4; @info = sort keys %{$fdat{-upload}} ; ($cgiok||$cgi4)?"@info":'Content-Disposition Content-Type' } +] Filename: [+ $cgiok?$fdat{upload}:'upload-filename' +] Content-Type: [+ $cgiok?$fdat{-upload} -> {'Content-Type'}:'test/plain' +] CGI-Version:[+ $CGI::VERSION +] - To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
svn commit: r1912443 [1/2] - in /perl/embperl/trunk: ./ Embperl/ Embperl/Form/ Embperl/Form/Control/ Embperl/Syntax/ driver/ eg/ eg/web/ test/cmp/ test/html/ test/html/EmbperlObject/ test/html/match/
Author: richter Date: Thu Sep 21 03:39:10 2023 New Revision: 1912443 URL: http://svn.apache.org/viewvc?rev=1912443&view=rev Log: Apply all patches from debian bookworm, see https://sources.debian.org/patches/libembperl-perl/2.5.0-17 Added: perl/embperl/trunk/.gitignore perl/embperl/trunk/test/cmp/includeerr2.htm520 Modified: perl/embperl/trunk/ (props changed) perl/embperl/trunk/Changes.pod perl/embperl/trunk/Embperl.pm perl/embperl/trunk/Embperl.pod perl/embperl/trunk/Embperl/Form.pm perl/embperl/trunk/Embperl/Form/Control.pm perl/embperl/trunk/Embperl/Form/Control/age.pm perl/embperl/trunk/Embperl/Form/Control/checkbox.pm perl/embperl/trunk/Embperl/Form/Control/datetime.pm perl/embperl/trunk/Embperl/Form/Control/duration.pm perl/embperl/trunk/Embperl/Form/Control/grid.pm perl/embperl/trunk/Embperl/Form/Control/number.pm perl/embperl/trunk/Embperl/Form/Control/price.pm perl/embperl/trunk/Embperl/Form/Control/table.pm perl/embperl/trunk/Embperl/Form/DataSource.pm perl/embperl/trunk/Embperl/Form/Validate.pm perl/embperl/trunk/Embperl/Mail.pm perl/embperl/trunk/Embperl/Object.pm perl/embperl/trunk/Embperl/Session.pm perl/embperl/trunk/Embperl/Syntax.pm perl/embperl/trunk/Embperl/Syntax/Embperl.pm perl/embperl/trunk/Embperl/Syntax/HTML.pm perl/embperl/trunk/Embperl/Syntax/POD.pm perl/embperl/trunk/Faq.pod perl/embperl/trunk/Features.pod perl/embperl/trunk/FeaturesD.pod perl/embperl/trunk/Intro.pod perl/embperl/trunk/Makefile.PL perl/embperl/trunk/Old.xs perl/embperl/trunk/TOC.pod perl/embperl/trunk/driver/eplibxslt.MAKEPL perl/embperl/trunk/eg/README perl/embperl/trunk/eg/web/epwebapp.pl perl/embperl/trunk/epmain.c perl/embperl/trunk/epnames.h perl/embperl/trunk/eputil.c perl/embperl/trunk/mod_embperl.c perl/embperl/trunk/test.pl perl/embperl/trunk/test/cmp/Execute.htm perl/embperl/trunk/test/cmp/div.asc perl/embperl/trunk/test/cmp/epobase.htm perl/embperl/trunk/test/cmp/errorfirstrun.htm perl/embperl/trunk/test/cmp/upload.htm perl/embperl/trunk/test/cmp/varerr.htm56 perl/embperl/trunk/test/html/EmbperlObject/epodiv.htm perl/embperl/trunk/test/html/delrdsess.htm perl/embperl/trunk/test/html/delsess.htm perl/embperl/trunk/test/html/delwrsess.htm perl/embperl/trunk/test/html/div.htm perl/embperl/trunk/test/html/execgetsess.htm perl/embperl/trunk/test/html/getbsess.htm perl/embperl/trunk/test/html/getdelsess.htm perl/embperl/trunk/test/html/getsess.htm perl/embperl/trunk/test/html/match/div.asc perl/embperl/trunk/test/html/match/div.htm perl/embperl/trunk/test/html/mdatsess.htm perl/embperl/trunk/test/html/nph/div.htm perl/embperl/trunk/test/html/ofunc/div.htm perl/embperl/trunk/test/html/opmask/opmasktrap.htm perl/embperl/trunk/test/html/plain.htm perl/embperl/trunk/test/html/safe/safe.htm perl/embperl/trunk/test/html/setbadsess.htm perl/embperl/trunk/test/html/setunknownsess.htm perl/embperl/trunk/test/html/sidurl/getsdaturlsess.htm perl/embperl/trunk/test/html/sidurl/geturlsess.htm perl/embperl/trunk/test/html/upload.htm Propchange: perl/embperl/trunk/ -- --- svn:ignore (original) +++ svn:ignore Thu Sep 21 03:39:10 2023 @@ -14,3 +14,23 @@ Embperl.bs *.opt *.dsp *.dsw +embperl.code-workspace +.vscode/ +MYMETA.json +MYMETA.yml +embpfastcgi.pl +embpfastcgi.test.pl +embpmsgid.pl +epocgi.bat +epocgi.pl +epocgi.test.pl +test/conf/config.pl +xs/ +xsbuilder/tables/ +*.o +*.old +*.orig +*.rej +patches/ +Embperl.bso +test/tmp/ Added: perl/embperl/trunk/.gitignore URL: http://svn.apache.org/viewvc/perl/embperl/trunk/.gitignore?rev=1912443&view=auto == --- perl/embperl/trunk/.gitignore (added) +++ perl/embperl/trunk/.gitignore Thu Sep 21 03:39:10 2023 @@ -0,0 +1,32 @@ +.svn +Cmd.c +DOM.c +Makefile +embpexec.pl +embpexec.bat +embpcgi.pl +embpcgi.bat +embpcgi.test.pl +pm_to_blib +blib +Embperl.c +Embperl.bs +*.ncb +*.opt +*.dsp +*.dsw +embperl.code-workspace +.vscode/ +MYMETA.json +MYMETA.yml +embpfastcgi.pl +embpfastcgi.test.pl +embpmsgid.pl +epocgi.bat +epocgi.pl +epocgi.test.pl +test/conf/config.pl +xs/ +xsbuilder/tables/ +*.o +*.old Modified: perl/embperl/trunk/Changes.pod URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Changes.pod?rev=1912443&r1=1912442&r2=1912443&view=diff == --- perl/embperl/trunk/Changes.pod (original) +++ perl/embperl/trunk/Changes.pod Thu Sep 21 03:39:10 2023 @@ -1,6 +1,8 @@ =pod -=head 2.5.0 16. March 2014 +=encoding iso8859-1 + +=head1 2.5.0 16. March 2014 - Do not clear old code before compiling a Embperl page in Perl >= 5.14.x because it causes seg faults. This @@ -
svn commit: r1912444 - in /perl/embperl/trunk: ./ Embperl/ Embperl/Form/ Embperl/Syntax/
Author: richter Date: Thu Sep 21 04:00:33 2023 New Revision: 1912444 URL: http://svn.apache.org/viewvc?rev=1912444&view=rev Log: Remove $Id tag, because it is not supported by git Modified: perl/embperl/trunk/Embperl.pm perl/embperl/trunk/Embperl/Form/Validate.pm perl/embperl/trunk/Embperl/Mail.pm perl/embperl/trunk/Embperl/Object.pm perl/embperl/trunk/Embperl/Syntax.pm perl/embperl/trunk/Embperl/Syntax/Embperl.pm perl/embperl/trunk/Embperl/Syntax/HTML.pm perl/embperl/trunk/Embperl/Syntax/POD.pm perl/embperl/trunk/Makefile.PL perl/embperl/trunk/epmain.c perl/embperl/trunk/epnames.h perl/embperl/trunk/eputil.c perl/embperl/trunk/mod_embperl.c perl/embperl/trunk/test.pl Modified: perl/embperl/trunk/Embperl.pm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl.pm?rev=1912444&r1=1912443&r2=1912444&view=diff == --- perl/embperl/trunk/Embperl.pm (original) +++ perl/embperl/trunk/Embperl.pm Thu Sep 21 04:00:33 2023 @@ -11,8 +11,6 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Id$ -# ### Modified: perl/embperl/trunk/Embperl/Form/Validate.pm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Form/Validate.pm?rev=1912444&r1=1912443&r2=1912444&view=diff == --- perl/embperl/trunk/Embperl/Form/Validate.pm (original) +++ perl/embperl/trunk/Embperl/Form/Validate.pm Thu Sep 21 04:00:33 2023 @@ -11,8 +11,6 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Id$ -# ### Modified: perl/embperl/trunk/Embperl/Mail.pm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Mail.pm?rev=1912444&r1=1912443&r2=1912444&view=diff == --- perl/embperl/trunk/Embperl/Mail.pm (original) +++ perl/embperl/trunk/Embperl/Mail.pm Thu Sep 21 04:00:33 2023 @@ -10,8 +10,6 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Id$ -# ### Modified: perl/embperl/trunk/Embperl/Object.pm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Object.pm?rev=1912444&r1=1912443&r2=1912444&view=diff == --- perl/embperl/trunk/Embperl/Object.pm (original) +++ perl/embperl/trunk/Embperl/Object.pm Thu Sep 21 04:00:33 2023 @@ -11,8 +11,7 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Id$ -# + ### Modified: perl/embperl/trunk/Embperl/Syntax.pm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Syntax.pm?rev=1912444&r1=1912443&r2=1912444&view=diff == --- perl/embperl/trunk/Embperl/Syntax.pm (original) +++ perl/embperl/trunk/Embperl/Syntax.pm Thu Sep 21 04:00:33 2023 @@ -11,8 +11,7 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Id$ -# + ### Modified: perl/embperl/trunk/Embperl/Syntax/Embperl.pm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Syntax/Embperl.pm?rev=1912444&r1=1912443&r2=1912444&view=diff == --- perl/embperl/trunk/Embperl/Syntax/Embperl.pm (original) +++ perl/embperl/trunk/Embperl/Syntax/Embperl.pm Thu Sep 21 04:00:33 2023 @@ -11,8 +11,7 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Id$ -# + ### Modified: perl/embperl/trunk/Embperl/Syntax/HTML.pm URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Embperl/Syntax/HTML.pm?rev=1912444&r1=1912443&r2=1912444&view=diff == --- perl/embperl/trunk/Embperl/Syntax/HTML.pm (original) +++ perl/embperl/trunk/Embperl/Syntax/HTML.pm Thu Sep 21 04:00:33 2023 @@ -11,8 +11,7 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARR
svn commit: r1912445 - /perl/embperl/trunk/podsrc/Config.spod
Author: richter Date: Thu Sep 21 04:06:19 2023 New Revision: 1912445 URL: http://svn.apache.org/viewvc?rev=1912445&view=rev Log: Apply debian patches to Config.pod to Config.spod Modified: perl/embperl/trunk/podsrc/Config.spod Modified: perl/embperl/trunk/podsrc/Config.spod URL: http://svn.apache.org/viewvc/perl/embperl/trunk/podsrc/Config.spod?rev=1912445&r1=1912444&r2=1912445&view=diff == --- perl/embperl/trunk/podsrc/Config.spod (original) +++ perl/embperl/trunk/podsrc/Config.spod Thu Sep 21 04:06:19 2023 @@ -1,6 +1,8 @@ =pod +=encoding iso8859-1 + =head1 NAME Embperl::Config - Embperl configuration and calling @@ -368,11 +370,11 @@ Configuration for components can be setu as argument when you call the component via C. -=head2 *CFG $application / Embperl_UseEnv / use_env / 2.0b6 / no / off unless runing as CGI script +=head2 *CFG $application / Embperl_UseEnv / use_env / 2.0b6 / no / off unless running as CGI script Tells Embperl to scan the enviromemt for configuration settings. -=head2 *CFG $application / / use_redirect_env / 2.0b6 / no / off unless runing as CGI script +=head2 *CFG $application / / use_redirect_env / 2.0b6 / no / off unless running as CGI script Tells Embperl to scan the enviromemt for configuration settings which has the prefix C. This is normally the case when the request is not the main request, @@ -380,7 +382,7 @@ but a subrequest. =head2 *CFG $application / Embperl_AppName / app_name / 2.0b6 / no -Specifies the name for an application. The name is basicly used to refer to this application +Specifies the name for an application. The name is basically used to refer to this application elsewhere in httpd.conf without the need to setup the parameters for the apllication again. @@ -580,7 +582,7 @@ Logs the parseing of the source =item dbgObjectSearch = 0x200 -Shows how Embperl::Objects seraches sourcefiles +Shows how Embperl::Objects searches sourcefiles =item dbgCache = 0x400 @@ -644,7 +646,7 @@ Do not mail more then errors. Set =head2 *CFG $application / Embperl_MAIL_ERRORS_RESET_TIME / mail_errors_reset_time / 2.0b6 / no -Reset error counter if for seconds no error has occured. +Reset error counter if for seconds no error has occurred. =head2 *CFG $application / Embperl_MAIL_ERRORS_RESEND_TIME / mail_errors_resend_time / 2.0b6 / no @@ -664,7 +666,7 @@ The file should contain the Perl code fo the application object. There must be no package name given (as the package is set by Embperl::Object) inside the file, but the @ISA should point to Embperl::App. If set this file is searched through the same search path as any content file. -After a successfull load the init method is called with the Embperl request object +After a successful load the init method is called with the Embperl request object as parameter. The init method can change the parameters inside the request object to influence the current request. @@ -677,7 +679,7 @@ This search through the searchpath is al Execute no path for the file is given. -In F or as evironment variable directories are +In F or as environment variable directories are separated by C<;> (on Unix C<:> works also). The parameter for C and the application object method expects/returns an array reference. This path is @@ -687,14 +689,14 @@ B appended to the searchpath. -Additional directories where Embperl::Object searches for files for the inital request. +Additional directories where Embperl::Object searches for files for the initial request. If a file is requested, but cannot be found at the given location, the directories given in the this path are additionally searched for the file. This applies only to the initial filename given to Embperl::Object and B to files called via Execute. -In F or as evironment variable directories are +In F or as environment variable directories are separated by C<;> (on Unix C<:> works also). The parameter for C and the application object method expects/returns an array reference. @@ -740,11 +742,11 @@ methods from this class. This class must -=head2 *CFG $request / Embperl_UseEnv / use_env / 2.0b6 / no / off unless runing as CGI script +=head2 *CFG $request / Embperl_UseEnv / use_env / 2.0b6 / no / off unless running as CGI script Tells Embperl to scan the enviromemt for configuration settings. -=head2 *CFG $request / / use_redirect_env / 2.0b6 / no / off unless runing as CGI script +=head2 *CFG $request / / use_redirect_env / 2.0b6 / no / off unless running as CGI script Tells Embperl to scan the enviromemt for configuration settings which has the prefix C. This is normally the case when the request is not the main request, @@ -916,11 +918,11 @@ cookie and the id for the state session -=head2 *CFG $component / Embperl_UseEnv / use_env / 2.0b6 / no / off unless runing as CGI script +=head2 *CFG
svn commit: r1912446 - /perl/embperl/trunk/Makefile.PL
Author: richter Date: Thu Sep 21 04:07:13 2023 New Revision: 1912446 URL: http://svn.apache.org/viewvc?rev=1912446&view=rev Log: fix indention Modified: perl/embperl/trunk/Makefile.PL Modified: perl/embperl/trunk/Makefile.PL URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Makefile.PL?rev=1912446&r1=1912445&r2=1912446&view=diff == --- perl/embperl/trunk/Makefile.PL (original) +++ perl/embperl/trunk/Makefile.PL Thu Sep 21 04:07:13 2023 @@ -112,12 +112,12 @@ sub MY::test_via_harness my ($txt) = shift -> MM::test_via_harness (@_) ; $txt =~ s/PERL_DL_NONLAZY=1/PERL_DL_NONLAZY=0/ ; if ($win32) +{ +if (!($txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ )) { -if (!($txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ )) -{ -$txt =~ s/\$\(FULLPERLRUN\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERLRUN\)/ -} +$txt =~ s/\$\(FULLPERLRUN\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERLRUN\)/ } +} return $txt ; } @@ -126,12 +126,12 @@ sub MY::test_via_script my ($txt) = shift -> MM::test_via_script (@_) ; $txt =~ s/PERL_DL_NONLAZY=1/PERL_DL_NONLAZY=0/ ; if ($win32) +{ +if (!($txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ )) { -if (!($txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERL\)/ )) -{ -$txt =~ s/\$\(FULLPERLRUN\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERLRUN\)/ -} +$txt =~ s/\$\(FULLPERLRUN\)/SET PATH=\$\(PATH\)\;$EPENVPATH\n\t\$\(FULLPERLRUN\)/ } +} $txt =~ s/\$\(TEST_FILE\)/\$(TEST_FILE) \$(TESTARGS)/g ; return $txt ; @@ -176,18 +176,17 @@ stop : pure_all } ; $txt =~ s/\tPERL_DL_NONLAZY=0 /\tSET PATH=\$\(PATH\)\;$EPENVPATH\n\t/g if ($win32) ; -$txt =~ s/\@cd/\n#\t\@cd/ ; # remove tests for subdirs -$txt =~ s/\$\(NOECHO\) cd/\n#\t\$\(NOECHO\) cd/ ; # remove tests for subdirs +$txt =~ s/\@cd/\n#\t\@cd/ ; # remove tests for subdirs +$txt =~ s/\$\(NOECHO\) cd/\n#\t\$\(NOECHO\) cd/ ; # remove tests for subdirs -$txt =~ s/(\$\(NOECHO\) \$\(ABSPERLRUN\) \-e \'chdir)/\n#$1/ ; # remove tests for subdirs -$txt =~ s/-e/\n# -e/g ; # remove tests for subdirs +$txt =~ s/(\$\(NOECHO\) \$\(ABSPERLRUN\) \-e \'chdir)/\n#$1/ ; # remove tests for subdirs +$txt =~ s/-e/\n# -e/g ; # remove tests for subdirs $txt =~ s/\r\n/\n/g ; # make doesn't like \r\n! - -return $txt ; -} +return $txt ; +} @@ -212,47 +211,47 @@ sub MY::dist_test { my $self = shift ; -my $txt = $self -> MM::dist_test (@_) ; +my $txt = $self -> MM::dist_test (@_) ; $txt =~ s/-I\$\(PERL_ARCHLIB\) -I\$\(PERL_LIB\)// ; $txt =~ s/\$\(PERL\)/\$\(PERLDT\)/ ; $txt =~ s/\$\(ABSPERLRUN\)/\$\(PERLDT\)/ ; -$main::perlbinpath = $self -> {FULLPERL} ; - -return $txt ; +$main::perlbinpath = $self -> {FULLPERL} ; + +return $txt ; } sub MY::dynamic { my $self = shift ; -my $txt = $self -> MM::dynamic (@_) ; +my $txt = $self -> MM::dynamic (@_) ; -$txt .= "\tcd crypto && \$(MAKE) SSL_BASE=$sslbase\n" if ($epc_enable) ; - -return $txt ; +$txt .= "\tcd crypto && \$(MAKE) SSL_BASE=$sslbase\n" if ($epc_enable) ; + +return $txt ; } sub MY::c_o { my $self = shift ; -my $txt = $self -> MM::c_o (@_) ; -my $opt = $win32?'Fo':'o ' ; +my $txt = $self -> MM::c_o (@_) ; +my $opt = $win32?'Fo':'o ' ; -$txt =~ s/\$\*/-$opt\$*\$(OBJ_EXT) \$*/g ; -my @txt = split (/\n/, $txt) ; -my $cpp = 0 ; -foreach (@txt) +$txt =~ s/\$\*/-$opt\$*\$(OBJ_EXT) \$*/g ; +my @txt = split (/\n/, $txt) ; +my $cpp = 0 ; +foreach (@txt) +{ +if (/\$\*\.cpp/) { -if (/\$\*\.cpp/) -{ -s/\$\(CCCMD\)/\$(CPPCMD) \$(CPPFLAGS)/ ; -} +s/\$\(CCCMD\)/\$(CPPCMD) \$(CPPFLAGS)/ ; } -$txt = join ("\n", @txt) ; +} +$txt = join ("\n", @txt) ; -return $txt ; +return $txt ; } @@ -261,23 +260,23 @@ sub MY::cflags { my $self = shift ; -my $txt = $self -> MM::cflags (@_) ; +my $txt = $self -> MM::cflags (@_) ; -if ($mp2cfg) -{ # with Apache 2, make sure we have the same defines as mod_perl -$txt =~ s/-O\d//g if ($ccdebug =~ /-O\d/) ; -$txt =~
svn commit: r1912447 - /perl/embperl/trunk/test.pl
Author: richter Date: Thu Sep 21 04:08:40 2023 New Revision: 1912447 URL: http://svn.apache.org/viewvc?rev=1912447&view=rev Log: avoid warning Modified: perl/embperl/trunk/test.pl Modified: perl/embperl/trunk/test.pl URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=1912447&r1=1912446&r2=1912447&view=diff == --- perl/embperl/trunk/test.pl (original) +++ perl/embperl/trunk/test.pl Thu Sep 21 04:08:40 2023 @@ -2128,7 +2128,7 @@ do unshift (@testargs, 'dbgbreak') if ($opt_dbgbreak) ; $txt = "#$testnum ". $file . ($debug != $defaultdebug ?"-d $debug ":"") . ($test->{msg} || '') . '...' ; - $txt .= ' ' x (50 - length ($txt)) ; + $txt .= ' ' x (60 - length ($txt)) ; print $txt ; @@ -2214,7 +2214,7 @@ do $txt2 = "$txt from file..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; unlink ($outfile) ; @@ -2235,7 +2235,7 @@ do if ($err == 0 || $opt_ignoreerror) { $txt2 = "$txt from memory..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; unlink ($outfile) ; @@ -2257,7 +2257,7 @@ do if ($err == 0 || $opt_ignoreerror) { $txt2 = "$txt to memory..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; my $outdata ; @@ -2284,7 +2284,7 @@ do if ($err == 0 || $opt_ignoreerror) { $txt2 = "$txt to tied handle..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; my $outdata ; @@ -2313,7 +2313,7 @@ do if ($err == 0 || $opt_ignoreerror) { $txt2 = "$txt from/to memory..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; my $outdata ; @@ -2358,7 +2358,7 @@ do if ($err == 0 || $opt_ignoreerror) { $txt2 = "$txt to memory..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; my $outdata ; @@ -2392,7 +2392,7 @@ do if (0) #$err == 0 || $opt_ignoreerror) { $txt2 = "errornous parameter (path) ..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; $err = eval { Embperl::Execute ({'inputfile' => '0', @@ -2414,7 +2414,7 @@ do if ($err == 0 || $opt_ignoreerror) { $txt2 = "errornous parameter (input) ..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; my $out ; @errors = () ; @@ -2441,7 +2441,7 @@ do if ($err == 0 || $opt_ignoreerror) { $txt2 = "errornous parameter (output) ..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; my $out ; @errors = () ; @@ -2491,7 +2491,7 @@ do $page = $src ; $txt2 = "$src ..."; - $txt2 .= ' ' x (50 - length ($txt2)) ; + $txt2 .= ' ' x (60 - length ($txt2)) ; print $txt2 ; my $outdata ; @@ -3009,7 +3009,7 @@ do } $txt = "#$testnum $file" . ($debug != $defaultdebug ?"-d $debug ":"") . '...' ; - $txt .= ' ' x (50 - length ($txt)) ; + $txt .= ' ' x (60 - length ($txt)) ; print $txt ; unlink ($outfile) ; - To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
svn commit: r1912449 - in /perl/embperl/trunk: .gitignore Makefile.PL driver/eplibxslt.c epnames.h test.pl test/conf/httpd.conf.src test/conf/httpd.min.conf.src
Author: richter Date: Thu Sep 21 04:10:05 2023 New Revision: 1912449 URL: http://svn.apache.org/viewvc?rev=1912449&view=rev Log: Apply existing patches for fedora Modified: perl/embperl/trunk/.gitignore perl/embperl/trunk/Makefile.PL perl/embperl/trunk/driver/eplibxslt.c perl/embperl/trunk/epnames.h perl/embperl/trunk/test.pl perl/embperl/trunk/test/conf/httpd.conf.src perl/embperl/trunk/test/conf/httpd.min.conf.src Modified: perl/embperl/trunk/.gitignore URL: http://svn.apache.org/viewvc/perl/embperl/trunk/.gitignore?rev=1912449&r1=1912448&r2=1912449&view=diff == --- perl/embperl/trunk/.gitignore (original) +++ perl/embperl/trunk/.gitignore Thu Sep 21 04:10:05 2023 @@ -30,3 +30,8 @@ xs/ xsbuilder/tables/ *.o *.old +*.orig +*.rej +patches/ +Embperl.bso +test/tmp/ Modified: perl/embperl/trunk/Makefile.PL URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Makefile.PL?rev=1912449&r1=1912448&r2=1912449&view=diff == --- perl/embperl/trunk/Makefile.PL (original) +++ perl/embperl/trunk/Makefile.PL Thu Sep 21 04:10:05 2023 @@ -98,6 +98,13 @@ $EP2 = -f "epcmd2.c" ; win32filetext => 'ApacheModuleActions.dll or mod_actions.so', }, + 'mod_unixd.c' => { +name=> 'unixd_module', +path=> ['$apache_src/modules/standard/mod_unixd.so', '$EPBINDIR/modules/mod_unixd.so', '$apache_src/mod_unixd.so'], +win32path => ['$apache_src/modules/standard/apachemoduleunixd.dll', '$EPBINDIR/modules/apachemoduleunixd.dll', '$EPBINDIR/modules/mod_unixd.so'], +file=> ['mod_unixd.so','apachemoduleunixd.dll'], +win32filetext => 'ApacheModuleUnixd.dll or mod_unixd.so', + } ) ; @@ -1377,6 +1384,30 @@ $o .= $sublibs ; $libs =~ s/-lz//g ; +# 06/06/23 Marcus Doemling: Must undo the flag "-Wl,-z,now" from the +# OTHERLDFLAGS, CCDLFLAGS, LDDLFLAGS and LDFLAGS. +# +# See: man ld => -z => keyword "now": +# +# "When generating an executable or shared library, mark it to tell the +# dynamic linker to resolve all symbols when the program is started, +# or when the shared library is loaded by dlopen, instead of deferring +# function call resolution to the point when the function is first +# called". +# +# This flag is undone by appanding the flag "-Wl,-z,lazy" to the end +# of all flag lists that use the offending flag. Later flags override +# earlier ones. +# +# The "-z now" linker flag would prevent Embperl to be usable outside +# of mod_perl since it would force the linker to resolve the mod_perl +# symbols even though they would not be used when running outside of +# mod_perl. + +$lazyflag = ' -Wl,-z,lazy'; + +$dynlib->{'OTHERLDFLAGS'} .= $lazyflag; + WriteMakefile( 'NAME'=> 'Embperl', 'VERSION_FROM' => 'Embperl.pm',# finds $VERSION @@ -1393,6 +1424,9 @@ WriteMakefile( 'realclean'=> { FILES => 'embpmsgid.pl embpexec.pl embpexec.bat embpcgi.pl embpcgi.test.pl embpcgi.bat epocgi.pl epocgi.bat epocgi.test.pl embpfastcgi.pl embpfastcgi.test.pl test/conf/config.pl xs/mmargs.pl' }, 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz'}, 'dynamic_lib' => $dynlib, +'CCDLFLAGS'=> $Config{ccdlflags}.$lazyflag, +'LDDLFLAGS'=> $Config{lddlflags}.$lazyflag, +'LDFLAGS' => $Config{ldflags}.$lazyflag, 'PREREQ_PM'=> { 'File::Spec' => 0.8 }, 'ABSTRACT' => 'Embed Perl code in HTML documents', 'AUTHOR' => 'Gerald Richter ', Modified: perl/embperl/trunk/driver/eplibxslt.c URL: http://svn.apache.org/viewvc/perl/embperl/trunk/driver/eplibxslt.c?rev=1912449&r1=1912448&r2=1912449&view=diff == --- perl/embperl/trunk/driver/eplibxslt.c (original) +++ perl/embperl/trunk/driver/eplibxslt.c Thu Sep 21 04:10:05 2023 @@ -23,7 +23,7 @@ #include #include #include -#include +// #include #include #include #include Modified: perl/embperl/trunk/epnames.h URL: http://svn.apache.org/viewvc/perl/embperl/trunk/epnames.h?rev=1912449&r1=1912448&r2=1912449&view=diff == --- perl/embperl/trunk/epnames.h (original) +++ perl/embperl/trunk/epnames.h Thu Sep 21 04:10:05 2023 @@ -343,7 +343,7 @@ #endif -#define SvGETMAGIC_P4(x) +#define SvGETMAGIC_P4(x) SvGETMAGIC(x) #else /* PERL_VERSION > 5 */ Modified: perl/embperl/trunk/test.pl URL: http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=1912449&r1=1912448&r2=1912449&view=diff == --- perl/embperl/trunk/test.pl (original) +++ perl/embperl/trunk/test.pl Th
svn commit: r1912451 - in /perl/embperl/trunk: ./ Embperl/ Embperl/Form/Validate/ Embperl/Recipe/ Embperl/Syntax/ crypto/ driver/ eg/webutil/ test/conf/
Author: richter Date: Thu Sep 21 04:30:47 2023 New Revision: 1912451 URL: http://svn.apache.org/viewvc?rev=1912451&view=rev Log: Remove $Id tag, because it is not supported by git Modified: perl/embperl/trunk/Cmd.xs perl/embperl/trunk/DOM.xs perl/embperl/trunk/Embperl/App.pm perl/embperl/trunk/Embperl/Constant.pm perl/embperl/trunk/Embperl/Form/Validate/DateTime.pm perl/embperl/trunk/Embperl/Form/Validate/DateTimeEU.pm perl/embperl/trunk/Embperl/Form/Validate/Default.pm perl/embperl/trunk/Embperl/Form/Validate/Duration.pm perl/embperl/trunk/Embperl/Form/Validate/EMail.pm perl/embperl/trunk/Embperl/Form/Validate/EMailRFC.pm perl/embperl/trunk/Embperl/Form/Validate/FQDN.pm perl/embperl/trunk/Embperl/Form/Validate/FQDN_IPAddr.pm perl/embperl/trunk/Embperl/Form/Validate/IPAddr.pm perl/embperl/trunk/Embperl/Form/Validate/IPAddr_Mask.pm perl/embperl/trunk/Embperl/Form/Validate/IPAddr_orRange.pm perl/embperl/trunk/Embperl/Form/Validate/Integer.pm perl/embperl/trunk/Embperl/Form/Validate/Number.pm perl/embperl/trunk/Embperl/Form/Validate/PosInteger.pm perl/embperl/trunk/Embperl/Form/Validate/Select.pm perl/embperl/trunk/Embperl/Form/Validate/TimeHHMM.pm perl/embperl/trunk/Embperl/Form/Validate/TimeHHMMSS.pm perl/embperl/trunk/Embperl/Form/Validate/TimeValue.pm perl/embperl/trunk/Embperl/Log.pm perl/embperl/trunk/Embperl/Module.pm perl/embperl/trunk/Embperl/Out.pm perl/embperl/trunk/Embperl/Recipe.pm perl/embperl/trunk/Embperl/Recipe/Embperl.pm perl/embperl/trunk/Embperl/Recipe/EmbperlLibXSLT.pm perl/embperl/trunk/Embperl/Recipe/EmbperlPODXSLT.pm perl/embperl/trunk/Embperl/Recipe/EmbperlXSLT.pm perl/embperl/trunk/Embperl/Recipe/EmbperlXalanXSLT.pm perl/embperl/trunk/Embperl/Recipe/LibXSLT.pm perl/embperl/trunk/Embperl/Recipe/XSLT.pm perl/embperl/trunk/Embperl/Recipe/XalanXSLT.pm perl/embperl/trunk/Embperl/Run.pm perl/embperl/trunk/Embperl/Syntax/ASP.pm perl/embperl/trunk/Embperl/Syntax/EmbperlBlocks.pm perl/embperl/trunk/Embperl/Syntax/EmbperlHTML.pm perl/embperl/trunk/Embperl/Syntax/Mail.pm perl/embperl/trunk/Embperl/Syntax/MsgIdExtract.pm perl/embperl/trunk/Embperl/Syntax/Perl.pm perl/embperl/trunk/Embperl/Syntax/RTF.pm perl/embperl/trunk/Embperl/Syntax/SSI.pm perl/embperl/trunk/Embperl/Syntax/Text.pm perl/embperl/trunk/Embperl/Util.pm perl/embperl/trunk/README.v2 perl/embperl/trunk/Syntax.xs perl/embperl/trunk/crypto/README perl/embperl/trunk/crypto/epcrypto.h perl/embperl/trunk/crypto/epcrypto_config.h perl/embperl/trunk/driver/epcurl.c perl/embperl/trunk/driver/eplibxslt.c perl/embperl/trunk/driver/epxalan.cpp perl/embperl/trunk/eg/webutil/db.schema perl/embperl/trunk/eg/webutil/setupdb.pl perl/embperl/trunk/embpcgi.bat.templ perl/embperl/trunk/embpcgi.pl.templ perl/embperl/trunk/embpcgi.test.pl.templ perl/embperl/trunk/embperl.h perl/embperl/trunk/embpexec.bat.templ perl/embperl/trunk/embpexec.pl.templ perl/embperl/trunk/embpfastcgi.pl.templ perl/embperl/trunk/embpfastcgi.test.pl.templ perl/embperl/trunk/embpmsgid.pl.templ perl/embperl/trunk/ep2.h perl/embperl/trunk/epapfilter.c perl/embperl/trunk/epcache.c perl/embperl/trunk/epcgiinit.c perl/embperl/trunk/epchar.c perl/embperl/trunk/epcmd.c perl/embperl/trunk/epcmd2.c perl/embperl/trunk/epcomp.c perl/embperl/trunk/epdat.h perl/embperl/trunk/epdat2.h perl/embperl/trunk/epdbg.c perl/embperl/trunk/epdefault.c perl/embperl/trunk/epdom.c perl/embperl/trunk/epdom.h perl/embperl/trunk/epeval.c perl/embperl/trunk/epinit.c perl/embperl/trunk/epio.c perl/embperl/trunk/epmem.c perl/embperl/trunk/epocgi.bat.templ perl/embperl/trunk/epocgi.pl.templ perl/embperl/trunk/epocgi.test.pl.templ perl/embperl/trunk/epparse.c perl/embperl/trunk/eppriv.h perl/embperl/trunk/epprovider.c perl/embperl/trunk/eppublic.h perl/embperl/trunk/test/conf/httpd.conf.src perl/embperl/trunk/test/conf/httpd.min.conf.src perl/embperl/trunk/test/conf/httpd.stop.conf.src Modified: perl/embperl/trunk/Cmd.xs URL: http://svn.apache.org/viewvc/perl/embperl/trunk/Cmd.xs?rev=1912451&r1=1912450&r2=1912451&view=diff == --- perl/embperl/trunk/Cmd.xs (original) +++ perl/embperl/trunk/Cmd.xs Thu Sep 21 04:30:47 2023 @@ -11,8 +11,6 @@ # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# $Id$ -# ### Modified: perl/embperl/trunk/DOM.xs URL: http://svn.apache.org/viewvc/perl/embperl/trunk/DOM.xs?rev=1912451&r1=1912450&r2=1912451&view=diff
svn commit: r1912452 - /perl/embperl/trunk/driver/eplibxslt.MAKEPL
Author: richter Date: Thu Sep 21 04:58:19 2023 New Revision: 1912452 URL: http://svn.apache.org/viewvc?rev=1912452&view=rev Log: Ask for libxml2 if ExtUtils::PkgConfig is not installed, instead of throwing an error Modified: perl/embperl/trunk/driver/eplibxslt.MAKEPL Modified: perl/embperl/trunk/driver/eplibxslt.MAKEPL URL: http://svn.apache.org/viewvc/perl/embperl/trunk/driver/eplibxslt.MAKEPL?rev=1912452&r1=1912451&r2=1912452&view=diff == --- perl/embperl/trunk/driver/eplibxslt.MAKEPL (original) +++ perl/embperl/trunk/driver/eplibxslt.MAKEPL Thu Sep 21 04:58:19 2023 @@ -4,6 +4,12 @@ use File::Find ; use Cwd ; use ExtUtils::PkgConfig ; + +BEGIN +{ +eval "use ExtUtils::PkgConfig" ; +$nopkgcfg = 1 if ($@) ; +} ; $win32 = ($^O eq 'MSWin32') ; my $prefix ; @@ -15,7 +21,7 @@ my $cflags2 ; my $version ; my $version2 ; -if (!$win32) +if (!$win32 && !$nopkgcfg) { my $pkg = 'libxml-2.0'; my %xml2_info = ExtUtils::PkgConfig->find ($pkg) ; - To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
svn commit: r1912453 - in /perl/embperl/trunk: .gitlab-ci.d/ .gitlab-ci.d/build-container.yml .gitlab-ci.yml
Author: richter Date: Thu Sep 21 04:59:58 2023 New Revision: 1912453 URL: http://svn.apache.org/viewvc?rev=1912453&view=rev Log: Add automated tests via gitlab ci Added: perl/embperl/trunk/.gitlab-ci.d/ perl/embperl/trunk/.gitlab-ci.d/build-container.yml perl/embperl/trunk/.gitlab-ci.yml Added: perl/embperl/trunk/.gitlab-ci.d/build-container.yml URL: http://svn.apache.org/viewvc/perl/embperl/trunk/.gitlab-ci.d/build-container.yml?rev=1912453&view=auto == --- perl/embperl/trunk/.gitlab-ci.d/build-container.yml (added) +++ perl/embperl/trunk/.gitlab-ci.d/build-container.yml Thu Sep 21 04:59:58 2023 @@ -0,0 +1,97 @@ +spec: + inputs: +imagename: +imagetag: +--- + + +container-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]: + stage: .pre + needs: [] + tags: +- shell + before_script: +- mkdir docker +- cd docker +- | + cat - < install-pre.sh + if test -e /usr/bin/yum +then + yum -y install perl gcc perl-CGI libxml2-devel libxslt-devel|| exit 1 + if egrep 'almalinux|rocky' /etc/os-release +then + yum -y install epel-release || exit 1 + dnf --enablerepo=epel -y install mod_perl-devel perl-Apache-Session perl-ExtUtils-PkgConfig || exit 1 + cpan LWP::UserAgent || exit 1 +else + yum -y install mod_perl-devel perl-Apache-Session perl-ExtUtils-PkgConfig || exit 1 +fi + cpan LWP::UserAgent || exit 1 + cpan ExtUtils::XSBuilder || exit 2 + cpan -f Apache::SessionX || exit 3 +fi + if test -e /usr/bin/apt +then + apt update || exit 3 + apt -y install libextutils-xsbuilder-perl libapache2-mod-perl2-dev apache2-dev libcgi-pm-perl libapache-sessionx-perl libextutils-pkgconfig-perl libxml2-dev libxslt1-dev || exit 4 +fi + EOD +- | + cat - < Dockerfile + from $[[ inputs.imagename ]]:$[[ inputs.imagetag ]] + copy install-pre.sh / + run bash install-pre.sh + EOD +- cat Dockerfile +- ls -l +- pwd +#- env | sort + script: +- pwd +- docker build . -t ep_$[[ inputs.imagename ]]:$[[ inputs.imagetag ]] + +build-offline-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]: + stage: build + needs: ["container-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]"] + image: +name: ep_$[[ inputs.imagename ]]:$[[ inputs.imagetag ]] +pull_policy: never + artifacts: +untracked: true + script: +- perl xsbuilder/source_scan.pl +- perl xsbuilder/xs_generate.pl +- APACHE_SRC=- perl Makefile.PL +- make + +test-offline-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]: + needs: ["build-offline-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]"] + image: +name: ep_$[[ inputs.imagename ]]:$[[ inputs.imagetag ]] +pull_policy: never + stage: test + script: +- make test + +build-apache-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]: + stage: build + needs: ["container-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]"] + image: +name: ep_$[[ inputs.imagename ]]:$[[ inputs.imagetag ]] +pull_policy: never + artifacts: +untracked: true + script: +- perl xsbuilder/source_scan.pl +- perl xsbuilder/xs_generate.pl +- perl Makefile.PL +- make + +test-apache-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]: + needs: ["build-apache-$[[ inputs.imagename ]]-$[[ inputs.imagetag ]]"] + image: +name: ep_$[[ inputs.imagename ]]:$[[ inputs.imagetag ]] +pull_policy: never + stage: test + script: +- make test \ No newline at end of file Added: perl/embperl/trunk/.gitlab-ci.yml URL: http://svn.apache.org/viewvc/perl/embperl/trunk/.gitlab-ci.yml?rev=1912453&view=auto == --- perl/embperl/trunk/.gitlab-ci.yml (added) +++ perl/embperl/trunk/.gitlab-ci.yml Thu Sep 21 04:59:58 2023 @@ -0,0 +1,38 @@ +include: + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: almalinux + imagetag: "9" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: almalinux + imagetag: "8" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: fedora + imagetag: "38" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: fedora + imagetag: "37" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: debian + imagetag: "12" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: debian + imagetag: "11" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: ubuntu + imagetag: "22.04" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: ubuntu + imagetag: "23.04" + - local: .gitlab-ci.d/build-container.yml +inputs: + imagename: amazonlinux + i