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 <richter at embperl dot org>',
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 <libxml/debugXML.h>
#include <libxml/HTMLtree.h>
#include <libxml/xmlIO.h>
-#include <libxml/DOCBparser.h>
+// #include <libxml/DOCBparser.h>
#include <libxml/xinclude.h>
#include <libxml/catalog.h>
#include <libxslt/xsltconfig.h>
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 Thu Sep 21 04:10:05 2023
@@ -14,6 +14,10 @@
#
###################################################################################
+# 06/06/23 Marcus Doemling: Avoid error: '.' is no longer in @INC
+
+use lib '.';
+
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl test.pl'
Modified: perl/embperl/trunk/test/conf/httpd.conf.src
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/httpd.conf.src?rev=1912449&r1=1912448&r2=1912449&view=diff
==============================================================================
--- perl/embperl/trunk/test/conf/httpd.conf.src (original)
+++ perl/embperl/trunk/test/conf/httpd.conf.src Thu Sep 21 04:10:05 2023
@@ -14,23 +14,6 @@ DocumentRoot \"$EPPATH/test\"
Listen $EPPORT
EOD
-if ($^O ne 'MSWin32')
- {
-print OFH <<EOD ;
-
-User $EPUSER
-Group $EPGROUP
-
-MinSpareServers 1
-MaxSpareServers 30
-StartServers 3
-MaxClients 10
-MaxRequestsPerChild 0
-
-
-EOD
- }
-
#print OFH "Listen ", $EPPORT , "\n" ;
print OFH "Listen ", $EPPORT + 3, "\n" ;
print OFH "Listen ", $EPPORT + 4, "\n" ;
@@ -56,6 +39,23 @@ print OFH "$EPMODPERL\n" ;
print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
+if ($^O ne 'MSWin32')
+ {
+print OFH <<EOD ;
+
+User $EPUSER
+Group $EPGROUP
+
+MinSpareServers 1
+MaxSpareServers 30
+StartServers 3
+MaxClients 10
+MaxRequestsPerChild 0
+
+
+EOD
+ }
+
##print OFH "PassEnv ACTION_PREFIX\n" ;
print OFH "PerlPassEnv TEST_PRELOAD\n" ;
Modified: perl/embperl/trunk/test/conf/httpd.min.conf.src
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/httpd.min.conf.src?rev=1912449&r1=1912448&r2=1912449&view=diff
==============================================================================
--- perl/embperl/trunk/test/conf/httpd.min.conf.src (original)
+++ perl/embperl/trunk/test/conf/httpd.min.conf.src Thu Sep 21 04:10:05 2023
@@ -20,8 +20,12 @@ Listen $EPPORT
EOD
+print OFH "$EPMODPERL\n" ;
+
+print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
+
if ($^O ne 'MSWin32')
- {
+ {
print OFH <<EOD ;
User $EPUSER
@@ -37,11 +41,6 @@ MaxRequestsPerChild 0
EOD
}
-print OFH "$EPMODPERL\n" ;
-
-print OFH "LoadModule embperl_module
\"$EPPATH/blib/arch/auto/Embperl/Embperl.so\"\n" if ($MP2) ;
-
-
print OFH <<EOD ;
ErrorLog tmp/httpd.err.log
PidFile tmp/httpd.pid
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
