httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1221299 - in /httpd/httpd/branches/2.4.x: ./ CHANGES build/rpm/httpd.spec.in docs/man/ab.1 docs/man/ab.8 docs/man/apxs.1 docs/man/apxs.8 docs/man/logresolve.1 docs/man/logresolve.8 support/Makefile.in
Date Tue, 20 Dec 2011 14:57:46 GMT
Author: minfrin
Date: Tue Dec 20 14:57:46 2011
New Revision: 1221299

URL: http://svn.apache.org/viewvc?rev=1221299&view=rev
Log:
Backport:
Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
corresponding man pages.

Added:
    httpd/httpd/branches/2.4.x/docs/man/ab.1
      - copied unchanged from r1221292, httpd/httpd/trunk/docs/man/ab.1
    httpd/httpd/branches/2.4.x/docs/man/apxs.1
      - copied unchanged from r1221292, httpd/httpd/trunk/docs/man/apxs.1
    httpd/httpd/branches/2.4.x/docs/man/logresolve.1
      - copied unchanged from r1221292, httpd/httpd/trunk/docs/man/logresolve.1
Removed:
    httpd/httpd/branches/2.4.x/docs/man/ab.8
    httpd/httpd/branches/2.4.x/docs/man/apxs.8
    httpd/httpd/branches/2.4.x/docs/man/logresolve.8
Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in
    httpd/httpd/branches/2.4.x/support/Makefile.in

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 14:57:46 2011
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1221299&r1=1221298&r2=1221299&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Dec 20 14:57:46 2011
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.0
 
+  *) Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
+     corresponding man pages. [Graham Leggett]
+
   *) Distinguish properly between the bindir and sbindir directories when
      installing binaries. Previously all binaries were silently installed to
      sbindir, whether they were system administration commands or not.

Modified: httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in?rev=1221299&r1=1221298&r2=1221299&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/branches/2.4.x/build/rpm/httpd.spec.in Tue Dec 20 14:57:46 2011
@@ -424,7 +424,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/cache-root
 
 %{_mandir}/man1/*
-%{_mandir}/man8/ab*
 %{_mandir}/man8/suexec*
 %{_mandir}/man8/apachectl.8*
 %{_mandir}/man8/httpd.8*
@@ -437,18 +436,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(-,root,root)
-%{_sbindir}/ab
+%{_bindir}/ab
 %{_bindir}/htdbm
 %{_bindir}/htdigest
 %{_bindir}/htpasswd
-%{_sbindir}/logresolve
-%{_sbindir}/httxt2dbm
+%{_bindir}/logresolve
+%{_bindir}/httxt2dbm
 %{_sbindir}/rotatelogs
 %{_mandir}/man1/htdbm.1*
 %{_mandir}/man1/htdigest.1*
 %{_mandir}/man1/htpasswd.1*
-%{_mandir}/man8/ab.8*
-%{_mandir}/man8/logresolve.8*
+%{_mandir}/man1/ab.1*
+%{_mandir}/man1/logresolve.1*
 %{_mandir}/man8/rotatelogs.8*
 %doc LICENSE NOTICE
 
@@ -483,12 +482,12 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %{_includedir}/httpd
-%{_sbindir}/apxs
+%{_bindir}/apxs
 %{_sbindir}/checkgid
 %{_bindir}/dbmmanage
 %{_sbindir}/envvars*
 %{_mandir}/man1/dbmmanage.1*
-%{_mandir}/man8/apxs.8*
+%{_mandir}/man1/apxs.1*
 %dir %{_libdir}/httpd/build
 %{_libdir}/httpd/build/*.mk
 %{_libdir}/httpd/build/instdso.sh

Modified: httpd/httpd/branches/2.4.x/support/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/support/Makefile.in?rev=1221299&r1=1221298&r2=1221299&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/support/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/support/Makefile.in Tue Dec 20 14:57:46 2011
@@ -3,8 +3,8 @@ DISTCLEAN_TARGETS = apxs apachectl dbmma
 
 CLEAN_TARGETS = suexec
 
-bin_PROGRAMS = htpasswd htdigest htdbm
-sbin_PROGRAMS = rotatelogs logresolve ab htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
+bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
+sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
 TARGETS  = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
 PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
@@ -17,13 +17,13 @@ install:
 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
 	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
 	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
-	@for i in dbmmanage; do \
+	@for i in apxs dbmmanage; do \
 	    if test -f "$(builddir)/$$i"; then \
 	        cp -p $$i $(DESTDIR)$(bindir); \
 	        chmod 755 $(DESTDIR)$(bindir)/$$i; \
 	    fi ; \
 	done
-	@for i in apxs apachectl; do \
+	@for i in apachectl; do \
 	    if test -f "$(builddir)/$$i"; then \
 	        cp -p $$i $(DESTDIR)$(sbindir); \
 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \



Mime
View raw message