X-Git-Url: https://git.rapsys.eu/ihttpd/blobdiff_plain/2742ca33d666c4e9872b1a0501c57b1e968dc5a9..5a25ac3f232b01b3a87d4161155a3a6777b5bce3:/SPECS/ihttpd.spec diff --git a/SPECS/ihttpd.spec b/SPECS/ihttpd.spec index f0f4594..7e4170e 100644 --- a/SPECS/ihttpd.spec +++ b/SPECS/ihttpd.spec @@ -1,3 +1,5 @@ +# (luigiwalser, ngompa): httpd build hates parallelization +%define _smp_ncpus_max 8 %define contentdir %{_datadir}/httpd %define docroot /var/www @@ -5,8 +7,8 @@ %{?!serverlimit:%global serverlimit 1024} Name: ihttpd -Version: 2.4.33 -Release: %mkrel 4 +Version: 2.4.54 +Release: %mkrel 1 Summary: The most widely used Web server on the Internet License: Apache License Group: System/Servers @@ -14,7 +16,6 @@ URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%version.tar.bz2 Source1: index.bin.c Source2: reboot.sh -Source14: ihttpd.tmpfiles Source15: ihttpd.service Source16: debug-sshd.service Source18: ihttpd.dracut @@ -29,19 +30,22 @@ Patch6: httpd-2.4.3-apctl-systemd.patch Patch7: httpd-2.4.10-detect-systemd.patch # Features/functional changes Patch20: httpd-2.4.3-release.patch +#Disable in ihttpd to avoid build fail #Patch23: httpd-2.4.4-export.patch Patch24: httpd-2.4.1-corelimit.patch -Patch26: httpd-2.4.4-r1337344+.patch +#Patch26: httpd-2.4.4-r1337344+.patch Patch27: httpd-2.4.2-icons.patch Patch28: httpd-2.4.4-r1332643+.patch +# http://marc.info/?l=apache-httpd-dev&m=134867223818085&w=2 +Patch29: httpd-2.4.27-systemd.patch Patch30: httpd-2.4.4-cachehardmax.patch #Patch31: httpd-2.4.18-sslmultiproxy.patch -Patch34: httpd-2.4.33-socket-activation.patch -Patch35: httpd-2.4.33-sslciphdefault.patch +Patch34: httpd-2.4.17-socket-activation.patch +#Patch35: httpd-2.4.33-sslciphdefault.patch # Bug fixes -#Patch55: httpd-2.4.4-malformed-host.patch -#Patch56: httpd-2.4.4-mod_unique_id.patch -#Patch57: httpd-2.4.10-sigint.patch +# http://issues.apache.org/bugzilla/show_bug.cgi?id=32524 +Patch100: httpd-2.4.25-ab_source_address.patch +Patch101: httpd-2.2.10-ldap_auth_now_modular_in-apr-util-dbd-ldap_fix.diff # For /var/www/html Requires: webserver-base @@ -53,6 +57,18 @@ Requires(post): rpm-helper >= 0.24.8-1 Requires(post): openssl makedev Requires(preun): rpm-helper >= 0.24.8-1 +BuildRequires: bison +BuildRequires: flex +BuildRequires: libcurl-devel +BuildRequires: libtool >= 1.4.2 +BuildRequires: multiarch-utils >= 1.0.3 +BuildRequires: pkgconfig(apr-1) >= 1.7.0-4 +BuildRequires: pkgconfig(apr-util-1) >= 1.6.1-5 +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(zlib) + %description This package contains the main binary of apache, a powerful, full-featured, efficient and freely-available Web server. Apache is also the most popular Web @@ -70,18 +86,21 @@ This version of apache is fully static, and few modules are available built-in. %patch6 -p1 -b .apctlsystemd %patch7 -p1 -b .detectsystemd +#Disable in ihttpd to avoid build fail #%patch23 -p1 -b .export %patch24 -p1 -b .corelimit -%patch26 -p1 -b .r1337344+ +#%patch26 -p1 -b .r1337344+ %patch27 -p1 -b .icons +%patch29 -p1 -b .systemd %patch30 -p1 -b .cachehardmax +# No longer applies #%patch31 -p1 -b .sslmultiproxy %patch34 -p1 -b .socketactivation -%patch35 -p1 -b .sslciphdefault +#%patch35 -p1 -b .sslciphdefault +#patch44 -p1 -b .luaresume -#%patch55 -p1 -b .malformedhost -#%patch56 -p1 -b .uniqueid -#%patch57 -p1 -b .sigint +%patch100 -p1 -b .ab_source_address.droplet +%patch101 -p0 -b .PR45994.droplet # Patch in vendor/release string sed "s/@RELEASE@/%{product_distribution}/" < %{PATCH20} | patch -p1 @@ -130,12 +149,13 @@ autoheader && autoconf || exit 1 # Required to be able to run as root export CFLAGS="$RPM_OPT_FLAGS -DBIG_SECURITY_HOLE" -export LDFLAGS="-Wl,-z,relro,-z,now" +ldflags_hacky_workaround_for_systemd_lib_not_added="-lsystemd " +export LDFLAGS="${ldflags_hacky_workaround_for_systemd_lib_not_added}-Wl,-z,relro,-z,now" # Hard-code path to links to avoid unnecessary builddep export LYNX_PATH=/usr/bin/links -%configure2_5x \ +%configure \ --enable-layout=IHttpd \ --sysconfdir='/etc' \ --includedir='/usr/include/ihttpd' \ @@ -166,7 +186,8 @@ export LYNX_PATH=/usr/bin/links --enable-modules=none \ --enable-mods-static='unixd auth_basic authn_core authn_file authz_core authz_host authz_user rewrite socache_shmcb dir mime log_config cgi ssl' -%make +# parallel build fails on the build host +%__make export CFLAGS="$RPM_OPT_FLAGS" gcc index.bin.c -o index.bin @@ -176,9 +197,6 @@ gcc index.bin.c -o index.bin #IHttpd sbin install -D -p -m 755 ihttpd %{buildroot}%{_sbindir}/ihttpd -#Tmpfiles.d config -install -D -p -m 644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/ihttpd.conf - #IHttpd dracut config install -D -p -m 644 %{SOURCE18} %{buildroot}%{_sysconfdir}/dracut.conf.d/99-%{name}.conf @@ -194,18 +212,13 @@ install -D -p -m 644 %{SOURCE20} %{buildroot}%{_prefix}/lib/%{name}/ install -D -p -m 644 %{SOURCE15} %{buildroot}%{_prefix}/lib/%{name}/ install -D -p -m 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/%{name}/ - -#%find_lang %name - %post -%_tmpfilescreate %{name} %_create_ssl_certificate %{name} %files -n %name %config(noreplace) %{_prefix}/lib/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/dracut.conf.d/99-%{name}.conf %{_sbindir}/%{name} -%{_tmpfilesdir}/%{name}.conf %dir %{_prefix}/lib/dracut/modules.d/99ihttpd %{_prefix}/lib/dracut/modules.d/99ihttpd/module-setup.sh %dir %{_prefix}/lib/%{name}