From f08926b1cd46ba85b07f02f2f0901b6d25801885 Mon Sep 17 00:00:00 2001 From: Emmanuel Lacour Date: Wed, 18 Apr 2012 15:57:36 +0200 Subject: [PATCH] Disable apache1.x build (conflicted build on apache >= 2.4) --- debian/patches/02_remove_apache1.x.diff | 50 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 51 insertions(+) create mode 100644 debian/patches/02_remove_apache1.x.diff diff --git a/debian/patches/02_remove_apache1.x.diff b/debian/patches/02_remove_apache1.x.diff new file mode 100644 index 0000000..b3ca4f0 --- /dev/null +++ b/debian/patches/02_remove_apache1.x.diff @@ -0,0 +1,50 @@ +From: Joe Gillotti +Subject: Disable apache1.x compilation + +diff -u --recursive suphp-0.7.1/configure.ac suphp-0.7.1-fixed/configure.ac +--- suphp-0.7.1/configure.ac 2009-03-14 13:58:11.000000000 -0400 ++++ suphp-0.7.1-fixed/configure.ac 2012-03-27 00:22:45.282086238 -0400 +@@ -241,7 +241,7 @@ + # Conditionally include UserGroup support + AM_CONDITIONAL([COND_APUSERGROUP], [test \( x"$SETID_MODE" = xparanoid \) -o \( x"$SETID_MODE" = xforce \) ]) + +-AC_CONFIG_FILES([Makefile src/Makefile src/apache/Makefile src/apache2/Makefile]) ++AC_CONFIG_FILES([Makefile src/Makefile src/apache2/Makefile]) + AC_OUTPUT + + if test "$APXS" = "/notfound/"; then +diff -u --recursive suphp-0.7.1/src/Makefile.am suphp-0.7.1-fixed/src/Makefile.am +--- suphp-0.7.1/src/Makefile.am 2008-03-29 09:02:36.000000000 -0400 ++++ suphp-0.7.1-fixed/src/Makefile.am 2012-03-27 00:23:10.262087138 -0400 +@@ -1,13 +1,10 @@ + AM_CXXFLAGS=-DOPT_CONFIGFILE=\"${sysconfdir}/suphp.conf\" + +-if COND_AP13 +- MAYBE_AP = apache +-endif + if COND_AP20 + MAYBE_AP = apache2 + endif +-SUBDIRS = $(MAYBE_AP) +-DIST_SUBDIRS = apache apache2 ++SUBDIRS = apache2 ++DIST_SUBDIRS = apache2 + + sbin_PROGRAMS = suphp + +diff -u --recursive suphp-0.7.1/src/Makefile.in suphp-0.7.1-fixed/src/Makefile.in +--- suphp-0.7.1/src/Makefile.in 2009-03-14 14:08:17.000000000 -0400 ++++ suphp-0.7.1-fixed/src/Makefile.in 2012-03-27 00:22:58.958086739 -0400 +@@ -214,10 +214,9 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AM_CXXFLAGS = -DOPT_CONFIGFILE=\"${sysconfdir}/suphp.conf\" +-@COND_AP13_TRUE@MAYBE_AP = apache + @COND_AP20_TRUE@MAYBE_AP = apache2 +-SUBDIRS = $(MAYBE_AP) +-DIST_SUBDIRS = apache apache2 ++SUBDIRS = apache2 ++DIST_SUBDIRS = apache2 + suphp_SOURCES = API.cpp API.hpp API_Helper.cpp API_Helper.hpp API_Linux.cpp API_Linux.hpp API_Linux_Logger.cpp API_Linux_Logger.hpp Application.cpp Application.hpp CommandLine.cpp CommandLine.hpp Configuration.cpp Configuration.hpp Environment.cpp Environment.hpp Exception.cpp Exception.hpp File.cpp File.hpp GroupInfo.cpp GroupInfo.hpp IOException.cpp IOException.hpp IniFile.cpp IniFile.hpp IniSection.cpp IniSection.hpp KeyNotFoundException.cpp KeyNotFoundException.hpp Logger.cpp Logger.hpp LookupException.cpp LookupException.hpp OutOfRangeException.cpp OutOfRangeException.hpp PathMatcher.hpp PathMatcher.cpp ParsingException.cpp ParsingException.hpp PointerException.cpp PointerException.hpp SecurityException.cpp SecurityException.hpp SmartPtr.hpp SoftException.cpp SoftException.hpp SystemException.cpp SystemException.hpp UserInfo.cpp UserInfo.hpp Util.cpp Util.hpp + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/debian/patches/series b/debian/patches/series index fe129ac..1fe5448 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_debian.diff +02_remove_apache1.x.diff -- 2.11.0