OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-Jun-2007 22:51:37
Branch: HEAD Handle: 2007062821513700
Modified files:
openpkg-src/apache apache.patch apache.spec
Log:
nuke envvars stuff (we have apache.sh), remove more runtime files and
cleanup packaging in general
Summary:
Revision Changes Path
1.33 +60 -10 openpkg-src/apache/apache.patch
1.420 +11 -13 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.32 -r1.33 apache.patch
--- openpkg-src/apache/apache.patch 23 Jun 2007 09:45:09 -0000 1.32
+++ openpkg-src/apache/apache.patch 28 Jun 2007 20:51:37 -0000 1.33
@@ -1,6 +1,6 @@
Index: build/config_vars.sh.in
--- build/config_vars.sh.in.orig 2006-07-12 05:38:44 +0200
-+++ build/config_vars.sh.in 2007-06-23 11:42:21 +0200
++++ build/config_vars.sh.in 2007-06-28 22:12:16 +0200
@@ -35,7 +35,7 @@
[EMAIL PROTECTED]@
fi
@@ -12,7 +12,7 @@
Index: config.layout
--- config.layout.orig 2004-11-21 19:50:36 +0100
-+++ config.layout 2007-06-23 11:42:21 +0200
++++ config.layout 2007-06-28 22:12:16 +0200
@@ -50,7 +50,7 @@
iconsdir: ${datadir}/icons
htdocsdir: ${datadir}/htdocs
@@ -24,7 +24,7 @@
runtimedir: ${localstatedir}/run
Index: configure
--- configure.orig 2007-01-06 07:40:00 +0100
-+++ configure 2007-06-23 11:42:21 +0200
++++ configure 2007-06-28 22:12:16 +0200
@@ -2711,6 +2711,11 @@
{ (exit 1); exit 1; }; }
fi
@@ -51,7 +51,7 @@
reconfig.yes)
Index: docs/conf/mime.types
--- docs/conf/mime.types.orig 2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types 2007-06-23 11:42:21 +0200
++++ docs/conf/mime.types 2007-06-28 22:12:16 +0200
@@ -265,6 +265,22 @@
application/vnd.novadigm.edm
application/vnd.novadigm.edx
@@ -77,7 +77,7 @@
application/vnd.palm
Index: docs/docroot/index.html
--- docs/docroot/index.html.orig 2004-11-20 21:16:24 +0100
-+++ docs/docroot/index.html 2007-06-23 11:42:21 +0200
++++ docs/docroot/index.html 2007-06-28 22:12:16 +0200
@@ -1 +1,7 @@
-<html><body><h1>It works!</h1></body></html>
\ No newline at end of file
@@ -90,7 +90,7 @@
+</html>
Index: modules/generators/mod_autoindex.c
--- modules/generators/mod_autoindex.c.orig 2006-07-12 05:38:44 +0200
-+++ modules/generators/mod_autoindex.c 2007-06-23 11:43:20 +0200
++++ modules/generators/mod_autoindex.c 2007-06-28 22:12:16 +0200
@@ -1544,17 +1544,17 @@
++cols;
@@ -114,7 +114,7 @@
++cols;
Index: server/Makefile.in
--- server/Makefile.in.orig 2006-03-09 22:29:55 +0100
-+++ server/Makefile.in 2007-06-23 11:42:21 +0200
++++ server/Makefile.in 2007-06-28 22:12:16 +0200
@@ -56,7 +56,8 @@
tmp=export_files_unsorted.txt; \
rm -f $$tmp && touch $$tmp; \
@@ -127,7 +127,7 @@
(ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
Index: srclib/apr-util/crypto/getuuid.c
--- srclib/apr-util/crypto/getuuid.c.orig 2006-04-14 20:01:58 +0200
-+++ srclib/apr-util/crypto/getuuid.c 2007-06-23 11:42:21 +0200
++++ srclib/apr-util/crypto/getuuid.c 2007-06-28 22:12:16 +0200
@@ -131,7 +131,7 @@
/* crap. this isn't crypto quality, but it will be Good Enough */
@@ -137,10 +137,60 @@
srand((unsigned int)(((time_now >> 32) ^ time_now) & 0xffffffff));
return rand() & 0x0FFFF;
+Index: support/Makefile.in
+--- support/Makefile.in.orig 2005-07-07 01:15:34 +0200
++++ support/Makefile.in 2007-06-28 22:16:54 +0200
+@@ -22,12 +22,6 @@
+ chmod 755 $(DESTDIR)$(sbindir)/$$i; \
+ fi ; \
+ done
+- @if test -f "$(builddir)/envvars-std"; then \
+- cp -p envvars-std $(DESTDIR)$(sbindir); \
+- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+- fi ; \
+- fi
+
+ htpasswd_OBJECTS = htpasswd.lo
+ htpasswd: $(htpasswd_OBJECTS)
+Index: support/apachectl.in
+--- support/apachectl.in.orig 2006-07-12 05:38:44 +0200
++++ support/apachectl.in 2007-06-28 22:15:56 +0200
+@@ -43,11 +43,6 @@
+ # the path to your httpd binary, including options if necessary
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+-# pick up any necessary environment variables
+-if test -f @exp_sbindir@/envvars; then
+- . @exp_sbindir@/envvars
+-fi
+-#
+ # a command that outputs a formatted text version of the HTML at the
+ # url given on the command line. Designed for lynx, however other
+ # programs may work.
Index: support/apxs.in
--- support/apxs.in.orig 2006-07-12 05:38:44 +0200
-+++ support/apxs.in 2007-06-23 11:42:21 +0200
-@@ -338,8 +338,7 @@
++++ support/apxs.in 2007-06-28 22:14:31 +0200
+@@ -190,9 +190,6 @@
+ my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+-my $envvars = get_vars("sbindir") . "/envvars";
+-$envvars = eval qq("$envvars");
+-$envvars = eval qq("$envvars");
+
+ #allow apxs to be run from the source tree, before installation
+ if ($0 =~ m:support/apxs$:) {
+@@ -204,7 +201,7 @@
+ exit 1;
+ }
+
+-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
++unless (grep /mod_so/, `$httpd -l`) {
+ error("Sorry, no shared object support for Apache");
+ error("available under your platform. Make sure");
+ error("the Apache module mod_so is compiled into");
+@@ -338,8 +335,7 @@
exit(1);
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.419 -r1.420 apache.spec
--- openpkg-src/apache/apache.spec 28 Jun 2007 20:12:00 -0000 1.419
+++ openpkg-src/apache/apache.spec 28 Jun 2007 20:51:37 -0000 1.420
@@ -233,14 +233,17 @@
%{l_make} %{l_mflags}
%install
- # install Apache
+ # install package
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- # adjust permissions
- chmod 755 $RPM_BUILD_ROOT%{l_prefix}/sbin/envvars
+ # create additional directories
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d \
+ $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache.dav
- # adjust GNU libtool configuration
+ # adjust GNU libtool configuration for apxs(1) runtime
%{l_shtool} install -c -m 755 \
-e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \
%{l_prefix}/share/apr/build-1/libtool \
@@ -262,13 +265,10 @@
%{SOURCE apache.base} \
%{SOURCE apache.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/
- mv $RPM_BUILD_ROOT%{l_prefix}/etc/apache/magic \
+ mv $RPM_BUILD_ROOT%{l_prefix}/etc/apache/magic \
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/mime.magic
- %{l_shtool} mkdir -f -p -m 755
$RPM_BUILD_ROOT%{l_prefix}/etc/apache/apache.d
# install run-command script
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.apache} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ -289,10 +289,6 @@
rm -rf style/latex
) || exit $?
- # create additional directories
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/var/apache/run/apache.dav
-
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
@@ -319,6 +315,8 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} apache stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/apache/log/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/apache/log/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/apache/run/*/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/apache/run/* >/dev/null 2>&1 || true
exit 0
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
