diff --git a/SOURCES/httpd-2.4.25-detect-systemd.patch b/SOURCES/httpd-2.4.25-detect-systemd.patch index f8e302b..3b91b5b 100644 --- a/SOURCES/httpd-2.4.25-detect-systemd.patch +++ b/SOURCES/httpd-2.4.25-detect-systemd.patch @@ -37,14 +37,6 @@ diff -uap httpd-2.4.25/acinclude.m4.detectsystemd httpd-2.4.25/acinclude.m4 diff -uap httpd-2.4.25/configure.in.detectsystemd httpd-2.4.25/configure.in --- httpd-2.4.25/configure.in.detectsystemd +++ httpd-2.4.25/configure.in -@@ -234,6 +234,7 @@ - AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) - APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) - APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`]) -+ APR_ADDTO(HTTPD_LIBS, [\$(PCRE_LIBS)]) - else - AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/]) - fi @@ -504,6 +510,8 @@ AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field]) fi @@ -54,22 +46,3 @@ diff -uap httpd-2.4.25/configure.in.detectsystemd httpd-2.4.25/configure.in dnl ## Set up any appropriate OS-specific environment variables for apachectl case $host in -@@ -668,6 +676,7 @@ - APACHE_SUBST(BUILTIN_LIBS) - APACHE_SUBST(SHLIBPATH_VAR) - APACHE_SUBST(OS_SPECIFIC_VARS) -+APACHE_SUBST(HTTPD_LIBS) - - PRE_SHARED_CMDS='echo ""' - POST_SHARED_CMDS='echo ""' ---- httpd-2.4.25/Makefile.in.detectsystemd -+++ httpd-2.4.25/Makefile.in -@@ -4,7 +4,7 @@ - - PROGRAM_NAME = $(progname) - PROGRAM_SOURCES = modules.c --PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) -+PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(HTTPD_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) - PROGRAM_PRELINK = $(COMPILE) -c $(top_srcdir)/server/buildmark.c - PROGRAM_DEPENDENCIES = \ - server/libmain.la \ diff --git a/SOURCES/httpd-2.4.25-selinux.patch b/SOURCES/httpd-2.4.25-selinux.patch index fa4614a..e60475d 100644 --- a/SOURCES/httpd-2.4.25-selinux.patch +++ b/SOURCES/httpd-2.4.25-selinux.patch @@ -11,7 +11,7 @@ Upstream-Status: unlikely to be any interest in this upstream +AC_CHECK_LIB(selinux, is_selinux_enabled, [ + AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported]) -+ APR_ADDTO(HTTPD_LIBS, [-lselinux]) ++ APR_ADDTO(AP_LIBS, [-lselinux]) +]) + AC_CACHE_CHECK([for gettid()], ac_cv_gettid, @@ -59,3 +59,33 @@ Upstream-Status: unlikely to be any interest in this upstream return OK; } +diff -uap httpd-2.4.25/configure.in.detectsystemd httpd-2.4.25/configure.in +--- httpd-2.4.25/configure.in.detectsystemd ++++ httpd-2.4.25/configure.in +@@ -234,6 +234,7 @@ + AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG]) + APR_ADDTO(PCRE_INCLUDES, [`$PCRE_CONFIG --cflags`]) + APR_ADDTO(PCRE_LIBS, [`$PCRE_CONFIG --libs`]) ++ APR_ADDTO(HTTPD_LIBS, [\$(PCRE_LIBS)]) + else + AC_MSG_ERROR([pcre-config for libpcre not found. PCRE is required and available from http://pcre.org/]) + fi +@@ -668,6 +676,7 @@ + APACHE_SUBST(BUILTIN_LIBS) + APACHE_SUBST(SHLIBPATH_VAR) + APACHE_SUBST(OS_SPECIFIC_VARS) ++APACHE_SUBST(HTTPD_LIBS) + + PRE_SHARED_CMDS='echo ""' + POST_SHARED_CMDS='echo ""' +--- httpd-2.4.25/Makefile.in.detectsystemd ++++ httpd-2.4.25/Makefile.in +@@ -4,7 +4,7 @@ + + PROGRAM_NAME = $(progname) + PROGRAM_SOURCES = modules.c +-PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) ++PROGRAM_LDADD = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(HTTPD_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) + PROGRAM_PRELINK = $(COMPILE) -c $(top_srcdir)/server/buildmark.c + PROGRAM_DEPENDENCIES = \ + server/libmain.la \ diff --git a/SPECS/httpd24u.spec b/SPECS/httpd24u.spec index 97ca1bd..99426fb 100644 --- a/SPECS/httpd24u.spec +++ b/SPECS/httpd24u.spec @@ -833,7 +833,7 @@ exit $rv %changelog * Mon Jun 19 2017 Ben Harper - 2.4.26-1.ius - Latest upstream -- update Patch19 and Patch25 from Fedora +- update Patch19 and Patch25 from Fedora along with tweaks for better separation of systemd and selinux to build on el6 http://pkgs.fedoraproject.org/cgit/rpms/httpd.git/commit/?id=59afc1533e764a1108136ae1aab3671632aa3797 - refresh Patch28 - update Patch57 from Fedora