Author: arekm Date: Tue Feb 21 18:39:55 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- builds but needs much more work (packaging modules, config files, possible
compat symlinks)
---- Files affected:
packages/apache:
apache.service (1.1 -> 1.2) , apache.spec (1.644 -> 1.645)
---- Diffs:
================================================================
Index: packages/apache/apache.service
diff -u packages/apache/apache.service:1.1 packages/apache/apache.service:1.2
--- packages/apache/apache.service:1.1 Wed Feb 1 17:04:39 2012
+++ packages/apache/apache.service Tue Feb 21 19:39:50 2012
@@ -1,5 +1,5 @@
[Unit]
-Description=The Apache HTTP Server (@NAME@ MPM)
+Description=The Apache HTTP Server
After=syslog.target network.target remote-fs.target nss-lookup.target
[Service]
@@ -7,11 +7,11 @@
PIDFile=/var/run/httpd.pid
EnvironmentFile=/etc/sysconfig/httpd
ExecStartPre=/bin/sh -c '/usr/bin/test -f "${HTTPD_CONF}" -o -d
"${HTTPD_CONF}" || (echo "${HTTPD_CONF} is not file or directory"; exit 1)'
-ExecStartPre=@EXEC@ -f ${HTTPD_CONF} $HTTPD_OPTS -t
-ExecStart=@EXEC@ -f ${HTTPD_CONF} $HTTPD_OPTS -k start
-ExecReload=@EXEC@ -f ${HTTPD_CONF} $HTTPD_OPTS -t
-ExecReload=@EXEC@ -f ${HTTPD_CONF} $HTTPD_OPTS -k graceful
-ExecStop=@EXEC@ -f ${HTTPD_CONF} $HTTPD_OPTS -k stop
+ExecStartPre=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -t
+ExecStart=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -k start
+ExecReload=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -t
+ExecReload=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -k graceful
+ExecStop=/usr/sbin/httpd -f ${HTTPD_CONF} $HTTPD_OPTS -k stop
PrivateTmp=true
[Install]
================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.644 packages/apache/apache.spec:1.645
--- packages/apache/apache.spec:1.644 Tue Feb 21 19:02:41 2012
+++ packages/apache/apache.spec Tue Feb 21 19:39:50 2012
@@ -96,7 +96,6 @@
Patch19: %{name}-conffile-path.patch
Patch20: %{name}-apxs.patch
Patch23: %{name}-suexec_fcgi.patch
-Patch24: %{name}-bug-48094.patch
#
http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348
Patch25: httpd-2.2.x-mod_ssl-sessioncaching.patch
Patch26: apache-mod_vhost_alias_docroot.patch
@@ -1786,8 +1785,9 @@
%patch18 -p1
%patch19 -p1
%patch20 -p1
-%patch23 -p1
-%patch24 -p1
+# ?
+#%patch23 -p1
+
# ?
#%patch25 -p1
# ?
@@ -1825,12 +1825,11 @@
cd ../..
CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
-for mpm in prefork worker %{?with_event:event} %{?with_itk:itk}; do
-install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
+install -d build; cd build
../%configure \
--enable-layout=PLD \
--disable-v4-mapped \
- $( [ "${mpm}" = "prefork" -o "${mpm}" = "worker" -o "${mpm}" = "event"
-o "${mpm}" = "itk" ] && echo "--enable-exception-hook" ) \
+ --enable-exception-hook \
--enable-modules=all \
--enable-mods-shared=all \
--enable-auth-anon \
@@ -1885,11 +1884,11 @@
--enable-speling \
--enable-rewrite \
--enable-so \
- --with-program-name=httpd.${mpm} \
- --with-mpm=${mpm} \
+ --with-program-name=httpd \
+ --enable-mpms-shared=all \
%ifarch %{ix86}
%ifnarch i386 i486
- $( [ "${mpm}" = "leader" ] && echo "--enable-nonportable-atomics=yes" )
\
+ --enable-nonportable-atomics=yes \
%endif
%endif
--with-suexec-bin=%{_sbindir}/suexec \
@@ -1904,18 +1903,6 @@
--with-pcre
%{__make}
-./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside
-cd ..
-
-done
-
-for mpm in worker %{?with_event:event} %{?with_itk:itk}; do
- if ! cmp -s buildmpm-prefork/modules-inside
buildmpm-${mpm}/modules-inside; then
- echo "List of compiled modules is different between prefork-MPM
and ${mpm}-MPM!"
- echo "Build failed."
- exit 1
- fi
-done
%install
rm -rf $RPM_BUILD_ROOT
@@ -1926,25 +1913,16 @@
$RPM_BUILD_ROOT/usr/lib/tmpfiles.d \
$RPM_BUILD_ROOT%{systemdunitdir}
-# prefork is default one
-%{__make} -C buildmpm-prefork install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-mpm=prefork
-sed -e "s|@EXEC@|%{_sbindir}/httpd.${mpm}|g;s|@NAME@|${mpm}|g" < %{SOURCE31} \
- > $RPM_BUILD_ROOT%{systemdunitdir}/httpd-${mpm}.service
-
-# install other mpm-s
-for mpm in worker %{?with_event:event} %{?with_itk:itk}; do
- install buildmpm-${mpm}/httpd.${mpm}
$RPM_BUILD_ROOT%{_sbindir}/httpd.${mpm}
- sed -e "s|@EXEC@|%{_sbindir}/httpd.${mpm}|g;s|@NAME@|${mpm}|g" <
%{SOURCE31} \
- > $RPM_BUILD_ROOT%{systemdunitdir}/httpd-${mpm}.service
-done
-ln -s httpd.prefork $RPM_BUILD_ROOT%{_sbindir}/httpd
-ln -s %{systemdunitdir}/httpd-prefork.service
$RPM_BUILD_ROOT/etc/systemd/system/httpd.service
+install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/httpd.service
+ln -s %{systemdunitdir}/httpd.service
$RPM_BUILD_ROOT/etc/systemd/system/httpd.service
ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
ln -s %{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run
ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs
+# we have own apache.conf
+rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
ln -s conf.d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
@@ -2055,7 +2033,6 @@
cd $cur
# htpasswd goes to %{_bindir}
-mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir}
ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
# cgi_test: create config file with ScriptAlias
@@ -2072,7 +2049,6 @@
%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/build/config.nice
%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/*.exp
%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.prefork.conf
%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/{extra,original}
%clean
@@ -2380,13 +2356,12 @@
%attr(755,root,root) %{_sbindir}/checkgid
%attr(755,root,root) %{_sbindir}/httpd
-%attr(755,root,root) %{_sbindir}/httpd.*
%dir %attr(770,root,http) /var/run/httpd
%dir %attr(770,root,http) /var/cache/httpd
/usr/lib/tmpfiles.d/%{name}.conf
-%{systemdunitdir}/httpd-*.service
+%{systemdunitdir}/httpd.service
%config(noreplace) %verify(not md5 mtime size)
/etc/systemd/system/httpd.service
%{_mandir}/man8/httpd.8*
@@ -2426,10 +2401,10 @@
%files tools
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ab
+%attr(755,root,root) %{_bindir}/ab
%attr(755,root,root) %{_sbindir}/apachectl
-%attr(755,root,root) %{_sbindir}/htdigest
-%attr(755,root,root) %{_sbindir}/logresolve
+%attr(755,root,root) %{_bindir}/htdigest
+%attr(755,root,root) %{_bindir}/logresolve
%attr(755,root,root) %{_sbindir}/rotatelogs
%{_mandir}/man1/ab.1*
%{_mandir}/man8/apachectl.8*
@@ -2439,7 +2414,7 @@
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/apxs
+%attr(755,root,root) %{_bindir}/apxs
%attr(755,root,root) %{_sbindir}/envvars*
%dir %{_libexecdir}
%dir %{_libexecdir}/build
@@ -2483,7 +2458,7 @@
%files mod_authn_alias
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_authn_alias.conf
-%attr(755,root,root) %{_libexecdir}/mod_authn_alias.so
+#%attr(755,root,root) %{_libexecdir}/mod_authn_alias.so
%files mod_authn_anon
%defattr(644,root,root,755)
@@ -2503,7 +2478,7 @@
%files mod_authn_default
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_authn_default.conf
-%attr(755,root,root) %{_libexecdir}/mod_authn_default.so
+#%attr(755,root,root) %{_libexecdir}/mod_authn_default.so
%files mod_authn_file
%defattr(644,root,root,755)
@@ -2525,7 +2500,7 @@
%files mod_authz_default
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_authz_default.conf
-%attr(755,root,root) %{_libexecdir}/mod_authz_default.so
+#%attr(755,root,root) %{_libexecdir}/mod_authz_default.so
%files mod_authz_groupfile
%defattr(644,root,root,755)
@@ -2564,8 +2539,8 @@
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_cache.conf
%attr(755,root,root) %{_sbindir}/htcacheclean
%attr(755,root,root) %{_libexecdir}/mod_cache.so
-%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so
-%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so
+#%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so
+#%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so
%{_mandir}/man8/htcacheclean.8*
%files mod_case_filter
@@ -2729,7 +2704,7 @@
%files mod_rewrite
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/httxt2dbm
+%attr(755,root,root) %{_bindir}/httxt2dbm
%attr(755,root,root) %{_libexecdir}/mod_rewrite.so
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_rewrite.conf
%{_mandir}/man1/httxt2dbm.1*
@@ -2796,8 +2771,8 @@
%files dbmtools
%defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/dbmmanage
-%attr(755,root,root) %{_sbindir}/htdbm
+%attr(755,root,root) %{_bindir}/dbmmanage
+%attr(755,root,root) %{_bindir}/htdbm
%{_mandir}/man1/dbmmanage.1*
%{_mandir}/man1/htdbm.1*
@@ -2813,6 +2788,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.645 2012/02/21 18:39:50 arekm
+- builds but needs much more work (packaging modules, config files, possible
compat symlinks)
+
Revision 1.644 2012/02/21 18:02:41 arekm
- initial 2.4.x fun
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.service?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.644&r2=1.645&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
