Hello community, here is the log from the commit of package xsp for openSUSE:Factory checked in at 2020-03-05 23:18:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xsp (Old) and /work/SRC/openSUSE:Factory/.xsp.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xsp" Thu Mar 5 23:18:39 2020 rev:52 rq:781341 version:4.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xsp/xsp.changes 2019-10-07 14:14:30.138826202 +0200 +++ /work/SRC/openSUSE:Factory/.xsp.new.26092/xsp.changes 2020-03-05 23:18:43.105192070 +0100 @@ -1,0 +2,7 @@ +Mon Mar 2 16:17:29 UTC 2020 - Marguerite Su <[email protected]> + +- update version 4.7.1 + * drop .NET 2.0 support + * add Mono.WebServer.Fpm + +------------------------------------------------------------------- Old: ---- 3.0.11.tar.gz New: ---- xsp-4.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.Y4W9Jf/_old 2020-03-05 23:18:43.597192349 +0100 +++ /var/tmp/diff_new_pack.Y4W9Jf/_new 2020-03-05 23:18:43.601192351 +0100 @@ -1,7 +1,7 @@ # # spec file for package xsp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,57 +16,67 @@ # +%define xspConfigsLocation %{_sysconfdir}/xsp/2.0 +%define xspAvailableApps %{xspConfigsLocation}/applications-available +%define xspEnabledApps %{xspConfigsLocation}/applications-enabled #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: xsp -Version: 3.0.11 +Version: 4.7.1 Release: 0 Summary: Web Server Hosting ASP.NET License: MIT Group: Productivity/Networking/Web/Servers -URL: https://www.mono-project.com/ -Source: https://github.com/mono/xsp/archive/%{version}.tar.gz +URL: https://github.com/mono/xsp +Source: https://github.com/mono/xsp/archive/%{version}/%{name}-%{version}.tar.gz Source1: xsp.conf Patch1: %{name}-3.0.11-fix-bashisms.patch Patch2: mono-440-build-fix.patch Patch3: mono-4-install.patch Patch4: xsp-add-systemd-support.patch Patch5: asp-state4-signals.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: fdupes +BuildRequires: libtool BuildRequires: mono-data-oracle BuildRequires: mono-data-sqlite BuildRequires: mono-devel >= 2.10.0 -BuildRequires: mono-nunit BuildRequires: mono-web BuildRequires: monodoc-core BuildRequires: pkgconfig BuildRequires: sqlite-devel BuildRequires: systemd-rpm-macros +Requires: libfpm_helper0 = %{version} +%{?systemd_ordering} %if 0%{?suse_version} >= 1330 BuildRequires: strip-nondeterminism -Requires(pre): user(wwwrun) -Requires(pre): group(www) -Requires(post): user(wwwrun) Requires(post): group(www) +Requires(post): user(wwwrun) +Requires(pre): group(www) +Requires(pre): user(wwwrun) %endif -%{?systemd_ordering} -%define xspConfigsLocation %{_sysconfdir}/xsp/2.0 -%define xspAvailableApps %{xspConfigsLocation}/applications-available -%define xspEnabledApps %{xspConfigsLocation}/applications-enabled %description The XSP server is a Web server that hosts the Mono System.Web classes for running what is commonly known as ASP.NET. -%define mcsver %({ mcs --version | awk '{print $5}' | cut -f1 -d"." ; mcs --version | awk '{print $5}' | cut -f2 -d"." ; } | xargs printf "%03d") +%package -n libfpm_helper0 +Summary: Mono.WebServer.FPM Helper +Group: System/Libraries + +%description -n libfpm_helper0 +Library of Mono.WebServer.FPM Helper. + +%package -n libfpm_helper-devel +Summary: Development files of libfpm_helper0 +Group: Development/Libraries/C and C++ +Requires: libfpm_helper0 = %{version} +%description -n libfpm_helper-devel +Development Files of libfpm_helper0. + +%define mcsver %({ mcs --version | awk '{print $5}' | cut -f1 -d"." ; mcs --version | awk '{print $5}' | cut -f2 -d"." ; } | xargs printf "%03d") %if 0%{?mcsver} >= 4000 %define target2_dir xsp2 %define target4_dir xsp4 @@ -96,25 +106,27 @@ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --sysconfdir=%{_sysconfdir} -make +%make_build %install -[ -x /usr/bin/strip-nondeterminism ] && strip-nondeterminism docs/Mono.FastCGI/Mono.FastCGI.zip docs/Mono.WebServer/Mono.WebServer.zip +[ -x %{_bindir}/strip-nondeterminism ] && strip-nondeterminism docs/Mono.FastCGI/Mono.FastCGI.zip docs/Mono.WebServer/Mono.WebServer.zip %make_install +find %{buildroot}%{_prefix}/lib -name "*.a" -delete -print +find %{buildroot} -type f -name "*.la" -delete -print rm -rf %{buildroot}%{_prefix}/lib/xsp/unittests mkdir -p %{buildroot}%{_datadir} mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_datadir} mkdir -p %{buildroot}/%{xspAvailableApps} mkdir -p %{buildroot}/%{xspEnabledApps} -mkdir -p %{buildroot}/etc/logrotate.d/ +mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/ mkdir -p %{buildroot}/srv/xsp2 mkdir -p %{buildroot}%{_fillupdir} mkdir -p %{buildroot}/run/xsp2 -mkdir -p %{buildroot}/usr/lib/tmpfiles.d/ +mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d/ mkdir -p %{buildroot}%{_sbindir} install -m 644 man/mono-asp-apps.1 %{buildroot}%{_mandir}/man1/mono-asp-apps.1 install -m 644 packaging/opensuse/sysconfig.xsp2 %{buildroot}%{_fillupdir} -install -m 644 packaging/opensuse/xsp2.logrotate %{buildroot}/etc/logrotate.d/xsp2 +install -m 644 packaging/opensuse/xsp2.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/xsp2 # new { mkdir -p %{buildroot}%{_datadir}/%{name}/scripts install -m 755 packaging/opensuse/xsp2.init %{buildroot}%{_datadir}/%{name}/scripts @@ -122,7 +134,7 @@ install -m 644 packaging/opensuse/xsp2.service %{buildroot}%{_unitdir}/xsp2.service # } end new install -m 755 tools/mono-asp-apps/mono-asp-apps %{buildroot}%{_bindir}/mono-asp-apps -install -m 644 %{SOURCE1} %{buildroot}/usr/lib/tmpfiles.d/ +install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d/ ln -s service %{buildroot}%{_sbindir}/rcxsp2 %fdupes %{buildroot}/%{_prefix} @@ -139,43 +151,44 @@ %postun %service_del_postun xsp2.service +%post -n libfpm_helper0 -p /sbin/ldconfig +%postun -n libfpm_helper0 -p /sbin/ldconfig + +%files -n libfpm_helper0 +%{_prefix}/lib/libfpm_helper.so.0.0.0 + +%files -n libfpm_helper-devel +%{_prefix}/lib/libfpm_helper.so +%{_prefix}/lib/libfpm_helper.so.0 + %files -%defattr(-,root,root) %doc NEWS README %{_bindir}/* %{_datadir}/pkgconfig/* -%dir %{_prefix}/lib/mono/%{target2_dir} -%{_prefix}/lib/mono/%{target2_dir}/Mono.WebServer2.dll -%{_prefix}/lib/mono/%{target2_dir}/fastcgi-mono-server2.exe -%{_prefix}/lib/mono/%{target2_dir}/mod-mono-server2.exe -%{_prefix}/lib/mono/%{target2_dir}/xsp2.exe %dir %{_prefix}/lib/mono/%{target4_dir} %{_prefix}/lib/mono/%{target4_dir}/Mono.WebServer2.dll %{_prefix}/lib/mono/%{target4_dir}/fastcgi-mono-server4.exe %{_prefix}/lib/mono/%{target4_dir}/mod-mono-server4.exe %{_prefix}/lib/mono/%{target4_dir}/xsp4.exe +%{_prefix}/lib/mono/%{target4_dir}/mono-fpm.exe %{_prefix}/lib/mono/gac/Mono.WebServer2 -%{_prefix}/lib/mono/gac/fastcgi-mono-server2 %{_prefix}/lib/mono/gac/fastcgi-mono-server4 -%{_prefix}/lib/mono/gac/mod-mono-server2 %{_prefix}/lib/mono/gac/mod-mono-server4 -%{_prefix}/lib/mono/gac/xsp2 %{_prefix}/lib/mono/gac/xsp4 +%{_prefix}/lib/mono/gac/mono-fpm %{_prefix}/lib/monodoc/sources/Mono.WebServer.* %{_prefix}/lib/monodoc/sources/Mono.FastCGI.* %{_prefix}/lib/xsp -%{_prefix}/share/man/*/* +%{_mandir}/*/* # new { %{_datadir}/%{name} -# %%{_datadir}/%%{name}/scripts -# %%{_datadir}/%%{name}/scripts/xsp2.init %{_unitdir}/xsp2.service # } end new -%config /etc/logrotate.d/xsp2 +%config %{_sysconfdir}/logrotate.d/xsp2 %{_fillupdir}/* %attr(0711,wwwrun,www) /srv/xsp2 %ghost %attr(0711,wwwrun,www) /run/xsp2 -/usr/lib/tmpfiles.d/ +%{_prefix}/lib/tmpfiles.d/ %{_sysconfdir}/%{name} %{_sbindir}/rcxsp2 ++++++ asp-state4-signals.patch ++++++ --- /var/tmp/diff_new_pack.Y4W9Jf/_old 2020-03-05 23:18:43.617192360 +0100 +++ /var/tmp/diff_new_pack.Y4W9Jf/_new 2020-03-05 23:18:43.617192360 +0100 @@ -1,17 +1,17 @@ -diff --git a/tools/asp_state/Makefile.am b/tools/asp_state/Makefile.am -index ea56700..1166c27 100644 ---- a/tools/asp_state/Makefile.am -+++ b/tools/asp_state/Makefile.am +Index: xsp-4.7.1/tools/asp_state/Makefile.am +=================================================================== +--- xsp-4.7.1.orig/tools/asp_state/Makefile.am ++++ xsp-4.7.1/tools/asp_state/Makefile.am @@ -1,4 +1,4 @@ -MCSFLAGS= -debug+ -debug:full -nologo +MCSFLAGS= -debug+ -debug:full -nologo -r:Mono.Posix.dll - scripts2 = asp-state2.exe - data2 = asp-state2.exe.config -diff --git a/tools/asp_state/asp_state.cs b/tools/asp_state/asp_state.cs -index 8ba8b62..0157ff5 100644 ---- a/tools/asp_state/asp_state.cs -+++ b/tools/asp_state/asp_state.cs + scripts4 = asp-state4.exe + data4 = asp-state4.exe.config +Index: xsp-4.7.1/tools/asp_state/asp_state.cs +=================================================================== +--- xsp-4.7.1.orig/tools/asp_state/asp_state.cs ++++ xsp-4.7.1/tools/asp_state/asp_state.cs @@ -11,6 +11,8 @@ using System; using System.IO; using System.Reflection; @@ -21,28 +21,27 @@ namespace Mono.ASPNET.Tools { -@@ -64,10 +66,22 @@ and works until <Enter> is pressed. +@@ -64,10 +66,21 @@ and works until <Enter> is pressed. public static void Main (string [] args) { if (args.Length == 0) { + UnixSignal [] signals = new UnixSignal[] { -+ new UnixSignal(Signum.SIGINT), -+ new UnixSignal(Signum.SIGTERM), -+ }; ++ new UnixSignal(Signum.SIGINT), ++ new UnixSignal(Signum.SIGTERM), ++ }; RemotingConfiguration.Configure (ConfigurationFileName, false); ShowVerboseConfigurationInfo(ConfigurationFileName); - Console.Write("Press <Enter> to stop..."); - Console.ReadLine (); -+ -+ // Wait for a unix signal to exit -+ for (bool exit = false; !exit; ) -+ { -+ int id = UnixSignal.WaitAny(signals); -+ if (id >= 0 && id < signals.Length) -+ { -+ if (signals[id].IsSet) exit = true; -+ } -+ } ++ // Wait for a unix signal to exit ++ for (bool exit = false; !exit; ) ++ { ++ int id = UnixSignal.WaitAny(signals); ++ if (id >= 0 && id < signals.Length) ++ { ++ if (signals[id].IsSet) exit = true; ++ } ++ } } else { ShowUsage(); } ++++++ mono-4-install.patch ++++++ --- /var/tmp/diff_new_pack.Y4W9Jf/_old 2020-03-05 23:18:43.625192365 +0100 +++ /var/tmp/diff_new_pack.Y4W9Jf/_new 2020-03-05 23:18:43.625192365 +0100 @@ -1,6 +1,7 @@ -diff -uprN xsp-3.0.11.old/packaging/opensuse/xsp2.init xsp-3.0.11.new/packaging/opensuse/xsp2.init ---- xsp-3.0.11.old/packaging/opensuse/xsp2.init 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/packaging/opensuse/xsp2.init 2016-06-08 15:07:47.954947643 +0300 +Index: xsp-4.7.1/packaging/opensuse/xsp2.init +=================================================================== +--- xsp-4.7.1.orig/packaging/opensuse/xsp2.init ++++ xsp-4.7.1/packaging/opensuse/xsp2.init @@ -111,7 +111,7 @@ # Check for missing binaries (stale symlinks should not happen) @@ -10,96 +11,65 @@ XSP2_WRAPPER=/usr/bin/xsp2 MONO_BIN=/usr/bin/mono test -x $XSP2_BIN || { echo "$XSP2_BIN not installed"; -diff -uprN xsp-3.0.11.old/scripts/Makefile.am xsp-3.0.11.new/scripts/Makefile.am ---- xsp-3.0.11.old/scripts/Makefile.am 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/scripts/Makefile.am 2016-06-08 15:08:27.210947559 +0300 -@@ -16,11 +16,11 @@ bin_SCRIPTS = $(bin2_scripts) $(tool2_sc - - CLEANFILES = $(bin2_scripts_real) $(tool2_scripts) $(bin_scripts) $(tool_scripts) $(bin4_scripts) $(tool4_scripts) - --plat_bindir2 = $(prefix)/lib/mono/2.0 -+plat_bindir2 = $(prefix)/lib/mono/xsp2 - plat_tooldir2 = $(prefix)/lib/xsp/2.0 +Index: xsp-4.7.1/scripts/Makefile.am +=================================================================== +--- xsp-4.7.1.orig/scripts/Makefile.am ++++ xsp-4.7.1/scripts/Makefile.am +@@ -16,7 +16,7 @@ bin_SCRIPTS = $(bin2_scripts) $(tool2_sc + + CLEANFILES = $(bin2_scripts_real) $(tool2_scripts) $(bin_scripts) $(tool_scripts) $(bin4_scripts) $(tool4_scripts) $(binplain_scripts) - if NET_4_0 -plat_bindir4 = $(prefix)/lib/mono/4.5 +plat_bindir4 = $(prefix)/lib/mono/xsp4 plat_tooldir4 = $(prefix)/lib/xsp/4.0 - endif - -diff -uprN xsp-3.0.11.old/src/Mono.WebServer/Makefile.am xsp-3.0.11.new/src/Mono.WebServer/Makefile.am ---- xsp-3.0.11.old/src/Mono.WebServer/Makefile.am 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/src/Mono.WebServer/Makefile.am 2016-06-08 15:10:08.520628986 +0300 -@@ -6,13 +6,13 @@ SYSTEMCORE_DEP=@SYSTEMCORE_DEP@ - monowebserver2dir = $(prefix)/lib/xsp/2.0 - monowebserver2_install = 2.0/Mono.WebServer2.dll - monowebserver2_references = -r:System.Web.dll -r:System.Configuration.dll -r:Mono.Security.dll -r:System.Core.dll --GACUTIL2=$(GACUTIL) -package 2.0 -+GACUTIL2=$(GACUTIL) -package xsp2 - - if NET_4_0 - monowebserver4dir = $(prefix)/lib/xsp/4.5 - monowebserver4_install = 4.0/Mono.WebServer2.dll - monowebserver4_references = $(monowebserver2_references) --GACUTIL4=$(GACUTIL) -package 4.5 -+GACUTIL4=$(GACUTIL) -package xsp4 - endif - noinst_SCRIPTS= $(monowebserver2_install) $(monowebserver4_install) -diff -uprN xsp-3.0.11.old/src/Mono.WebServer.Apache/Makefile.am xsp-3.0.11.new/src/Mono.WebServer.Apache/Makefile.am ---- xsp-3.0.11.old/src/Mono.WebServer.Apache/Makefile.am 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/src/Mono.WebServer.Apache/Makefile.am 2016-06-08 15:11:06.756628861 +0300 -@@ -3,11 +3,11 @@ builddir=$(top_builddir)/src/Mono.WebSer + REWRITE2 = sed \ +Index: xsp-4.7.1/src/Mono.WebServer.Apache/Makefile.am +=================================================================== +--- xsp-4.7.1.orig/src/Mono.WebServer.Apache/Makefile.am ++++ xsp-4.7.1/src/Mono.WebServer.Apache/Makefile.am +@@ -3,7 +3,7 @@ builddir=$(top_builddir)/src/Mono.WebSer MCSFLAGS= -unsafe -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -keyfile:$(top_srcdir)/src/mono.snk - MODMONOSERVER2_EXE = mod-mono-server2.exe --GACUTIL2=$(GACUTIL) -package 2.0 -+GACUTIL2=$(GACUTIL) -package xsp2 - - if NET_4_0 MODMONOSERVER4_EXE = mod-mono-server4.exe -GACUTIL4=$(GACUTIL) -package 4.5 +GACUTIL4=$(GACUTIL) -package xsp4 - endif - noinst_SCRIPTS = $(MODMONOSERVER2_EXE) $(MODMONOSERVER4_EXE) -diff -uprN xsp-3.0.11.old/src/Mono.WebServer.FastCgi/Makefile.am xsp-3.0.11.new/src/Mono.WebServer.FastCgi/Makefile.am ---- xsp-3.0.11.old/src/Mono.WebServer.FastCgi/Makefile.am 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/src/Mono.WebServer.FastCgi/Makefile.am 2016-06-08 15:11:23.980628824 +0300 -@@ -3,11 +3,11 @@ builddir=$(top_builddir)/src/Mono.WebSer - MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+ -keyfile:$(top_srcdir)/src/mono.snk + noinst_SCRIPTS = $(MODMONOSERVER4_EXE) + +Index: xsp-4.7.1/src/Mono.WebServer.FastCgi/Makefile.am +=================================================================== +--- xsp-4.7.1.orig/src/Mono.WebServer.FastCgi/Makefile.am ++++ xsp-4.7.1/src/Mono.WebServer.FastCgi/Makefile.am +@@ -1,9 +1,9 @@ +-builddir=$(top_builddir)/src/Mono.WebServer.FastCgi ++bilddir=$(top_builddir)/src/Mono.WebServer.FastCgi - XSP2_EXE = fastcgi-mono-server2.exe --GACUTIL2=$(GACUTIL) -package 2.0 -+GACUTIL2=$(GACUTIL) -package xsp2 + MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+ -keyfile:$(top_srcdir)/src/mono.snk - if NET_4_0 XSP4_EXE = fastcgi-mono-server4.exe -GACUTIL4=$(GACUTIL) -package 4.5 +GACUTIL4=$(GACUTIL) -package xsp4 - endif - noinst_SCRIPTS = $(XSP2_EXE) $(XSP4_EXE) -diff -uprN xsp-3.0.11.old/src/Mono.WebServer.XSP/Makefile.am xsp-3.0.11.new/src/Mono.WebServer.XSP/Makefile.am ---- xsp-3.0.11.old/src/Mono.WebServer.XSP/Makefile.am 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/src/Mono.WebServer.XSP/Makefile.am 2016-06-08 15:11:40.280628788 +0300 -@@ -4,11 +4,11 @@ pkgconfigdir=$(libdir)/pkgconfig - MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 -unsafe $(WEBTRACING) -keyfile:$(top_srcdir)/src/mono.snk + noinst_SCRIPTS = $(XSP4_EXE) - XSP2_EXE = xsp2.exe --GACUTIL2=$(GACUTIL) -package 2.0 -+GACUTIL2=$(GACUTIL) -package xsp2 +Index: xsp-4.7.1/src/Mono.WebServer.XSP/Makefile.am +=================================================================== +--- xsp-4.7.1.orig/src/Mono.WebServer.XSP/Makefile.am ++++ xsp-4.7.1/src/Mono.WebServer.XSP/Makefile.am +@@ -4,7 +4,7 @@ pkgconfigdir=$(libdir)/pkgconfig + MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 -unsafe $(WEBTRACING) -keyfile:$(top_srcdir)/src/mono.snk - if NET_4_0 XSP4_EXE = xsp4.exe -GACUTIL4=$(GACUTIL) -package 4.5 +GACUTIL4=$(GACUTIL) -package xsp4 - endif - noinst_SCRIPTS = $(XSP2_EXE) $(XSP4_EXE) -diff -uprN xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-2.pc.in xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-2.pc.in ---- xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-2.pc.in 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-2.pc.in 2016-06-08 15:07:47.954947643 +0300 + noinst_SCRIPTS = $(XSP4_EXE) + +Index: xsp-4.7.1/src/Mono.WebServer.XSP/xsp-2.pc.in +=================================================================== +--- xsp-4.7.1.orig/src/Mono.WebServer.XSP/xsp-2.pc.in ++++ xsp-4.7.1/src/Mono.WebServer.XSP/xsp-2.pc.in @@ -1,5 +1,5 @@ prefix=@prefix@ -assemblies_dir=${prefix}/lib/mono/2.0 @@ -107,9 +77,10 @@ Libraries=${assemblies_dir}/Mono.WebServer2.dll Executable=${assemblies_dir}/xsp2.exe -diff -uprN xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-4.pc.in xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-4.pc.in ---- xsp-3.0.11.old/src/Mono.WebServer.XSP/xsp-4.pc.in 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/src/Mono.WebServer.XSP/xsp-4.pc.in 2016-06-08 15:24:35.764508410 +0300 +Index: xsp-4.7.1/src/Mono.WebServer.XSP/xsp-4.pc.in +=================================================================== +--- xsp-4.7.1.orig/src/Mono.WebServer.XSP/xsp-4.pc.in ++++ xsp-4.7.1/src/Mono.WebServer.XSP/xsp-4.pc.in @@ -1,5 +1,5 @@ prefix=@prefix@ -assemblies_dir=${prefix}/lib/mono/4.5 @@ -117,3 +88,29 @@ Libraries=${assemblies_dir}/Mono.WebServer2.dll Executable=${assemblies_dir}/xsp4.exe +Index: xsp-4.7.1/src/Mono.WebServer/Makefile.am +=================================================================== +--- xsp-4.7.1.orig/src/Mono.WebServer/Makefile.am ++++ xsp-4.7.1/src/Mono.WebServer/Makefile.am +@@ -6,7 +6,7 @@ SYSTEMCORE_DEP=@SYSTEMCORE_DEP@ + monowebserver4dir = $(prefix)/lib/xsp/4.5 + monowebserver4_install = 4.0/Mono.WebServer2.dll + monowebserver4_references = -r:System.Web.dll -r:System.Configuration.dll -r:Mono.Security.dll -r:System.Core.dll -r:Mono.Posix.dll +-GACUTIL4=$(GACUTIL) -package 4.5 ++GACUTIL4=$(GACUTIL) -package xsp4 + + noinst_SCRIPTS= $(monowebserver4_install) + +Index: xsp-4.7.1/src/Mono.WebServer.Fpm/Makefile.am +=================================================================== +--- xsp-4.7.1.orig/src/Mono.WebServer.Fpm/Makefile.am ++++ xsp-4.7.1/src/Mono.WebServer.Fpm/Makefile.am +@@ -3,7 +3,7 @@ builddir=$(top_builddir)/src/Mono.WebSer + MCSFLAGS= -debug+ -debug:full -nologo -nowarn:618 $(WEBTRACING) -unsafe+ -keyfile:$(top_srcdir)/src/mono.snk + + XSP_EXE = mono-fpm.exe +-GACUTIL4=$(GACUTIL) -package 4.5 ++GACUTIL4=$(GACUTIL) -package xsp4 + + noinst_SCRIPTS = $(XSP_EXE) + ++++++ mono-440-build-fix.patch ++++++ --- /var/tmp/diff_new_pack.Y4W9Jf/_old 2020-03-05 23:18:43.633192369 +0100 +++ /var/tmp/diff_new_pack.Y4W9Jf/_new 2020-03-05 23:18:43.637192371 +0100 @@ -1,6 +1,7 @@ -diff -uprN xsp-3.0.11.old/build/m4/shamrock/mono.m4 xsp-3.0.11.new/build/m4/shamrock/mono.m4 ---- xsp-3.0.11.old/build/m4/shamrock/mono.m4 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/build/m4/shamrock/mono.m4 2016-06-08 12:30:43.330749909 +0300 +Index: xsp-4.7.1/build/m4/shamrock/mono.m4 +=================================================================== +--- xsp-4.7.1.orig/build/m4/shamrock/mono.m4 ++++ xsp-4.7.1/build/m4/shamrock/mono.m4 @@ -74,21 +74,21 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_1_0_GAC_AS AC_DEFUN([SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES], @@ -17,28 +18,28 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_4_0_GAC_ASSEMBLIES], [ -- _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0, $*) -+ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.0-api, $*) +- _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.5, $*) ++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono, 4.5-api, $*) ]) AC_DEFUN([SHAMROCK_CHECK_MONO2_4_0_GAC_ASSEMBLIES], [ -- _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0, $*) -+ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.0-api, $*) +- _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.5, $*) ++ _SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES(mono-2, 4.5-api, $*) ]) -diff -uprN xsp-3.0.11.old/configure.ac xsp-3.0.11.new/configure.ac ---- xsp-3.0.11.old/configure.ac 2013-05-14 15:46:56.000000000 +0400 -+++ xsp-3.0.11.new/configure.ac 2016-06-08 12:30:43.330749909 +0300 -@@ -76,8 +76,8 @@ if test "x$GMCS" = "xno" -a "x$DMCS" = " +Index: xsp-4.7.1/configure.ac +=================================================================== +--- xsp-4.7.1.orig/configure.ac ++++ xsp-4.7.1/configure.ac +@@ -73,8 +73,8 @@ if test "x$DMCS" = "xno" ; then fi - AC_MSG_CHECKING([for Mono 2.0 GAC for Mono.Data.Sqlite.dll]) --if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0/Mono.Data.Sqlite.dll" -o \ -- -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0/Mono.Data.Sqlite.dll"; then -+if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/2.0-api/Mono.Data.Sqlite.dll" -o \ -+ -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/2.0-api/Mono.Data.Sqlite.dll"; then + AC_MSG_CHECKING([for Mono 4.5 GAC for Mono.Data.Sqlite.dll]) +-if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/4.5/Mono.Data.Sqlite.dll" -o \ +- -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/4.5/Mono.Data.Sqlite.dll"; then ++if test -e "$($PKG_CONFIG --variable=libdir mono)/mono/4.5-api/Mono.Data.Sqlite.dll" -o \ ++ -e "$($PKG_CONFIG --variable=prefix mono)/lib/mono/4.5-api/Mono.Data.Sqlite.dll"; then AC_MSG_RESULT([found]) HAVE_MONO_SQLITE=yes else -
