debian/patches/02_remove_apache1.x.diff

   1 From: Joe Gillotti <joe@u13.net>
   2 Subject: Disable apache1.x compilation
   3
   4 diff -u --recursive suphp-0.7.1/configure.ac suphp-0.7.1-fixed/configure.ac
   5 --- suphp-0.7.1/configure.ac    2009-03-14 13:58:11.000000000 -0400
   6 +++ suphp-0.7.1-fixed/configure.ac      2012-03-27 00:22:45.282086238 -0400
   7 @@ -241,7 +241,7 @@
   8  # Conditionally include UserGroup support
   9  AM_CONDITIONAL([COND_APUSERGROUP], [test \( x"$SETID_MODE" = xparanoid \) -o \( x"$SETID_MODE" = xforce \) ])
  10
  11 -AC_CONFIG_FILES([Makefile src/Makefile src/apache/Makefile src/apache2/Makefile])
  12 +AC_CONFIG_FILES([Makefile src/Makefile src/apache2/Makefile])
  13  AC_OUTPUT
  14
  15  if test "$APXS" = "/notfound/"; then
  16 diff -u --recursive suphp-0.7.1/src/Makefile.am suphp-0.7.1-fixed/src/Makefile.am
  17 --- suphp-0.7.1/src/Makefile.am 2008-03-29 09:02:36.000000000 -0400
  18 +++ suphp-0.7.1-fixed/src/Makefile.am   2012-03-27 00:23:10.262087138 -0400
  19 @@ -1,13 +1,10 @@
  20  AM_CXXFLAGS=-DOPT_CONFIGFILE=\"${sysconfdir}/suphp.conf\"
  21
  22 -if COND_AP13
  23 -  MAYBE_AP = apache
  24 -endif
  25  if COND_AP20
  26    MAYBE_AP = apache2
  27  endif
  28 -SUBDIRS = $(MAYBE_AP)
  29 -DIST_SUBDIRS = apache apache2
  30 +SUBDIRS = apache2
  31 +DIST_SUBDIRS = apache2
  32
  33  sbin_PROGRAMS = suphp
  34
  35 diff -u --recursive suphp-0.7.1/src/Makefile.in suphp-0.7.1-fixed/src/Makefile.in
  36 --- suphp-0.7.1/src/Makefile.in 2009-03-14 14:08:17.000000000 -0400
  37 +++ suphp-0.7.1-fixed/src/Makefile.in   2012-03-27 00:22:58.958086739 -0400
  38 @@ -214,10 +214,9 @@
  39  top_builddir = @top_builddir@
  40  top_srcdir = @top_srcdir@
  41  AM_CXXFLAGS = -DOPT_CONFIGFILE=\"${sysconfdir}/suphp.conf\"
  42 -@COND_AP13_TRUE@MAYBE_AP = apache
  43  @COND_AP20_TRUE@MAYBE_AP = apache2
  44 -SUBDIRS = $(MAYBE_AP)
  45 -DIST_SUBDIRS = apache apache2
  46 +SUBDIRS = apache2
  47 +DIST_SUBDIRS = apache2
  48  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
  49  all: config.h
  50         $(MAKE) $(AM_MAKEFLAGS) all-recursive