Changeset 17645


Ignore:
Timestamp:
2009-09-20T15:13:05+02:00 (7 years ago)
Author:
florian
Message:

[package] update apache to 2.2.13, drop httpd.conf file and patch it directly in the sources (#5858)

Location:
packages/net/apache
Files:
1 added
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • packages/net/apache/Makefile

    r15483 r17645  
    99 
    1010PKG_NAME:=apache 
    11 PKG_VERSION:=2.2.9 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=2.2.13 
     12PKG_RELEASE:=1 
    1313PKG_SOURCE_NAME:=httpd 
    1414 
     
    1616PKG_SOURCE_URL:=http://ftp.uni-erlangen.de/pub/mirrors/apache/httpd/ \ 
    1717                http://apache.imsam.info/httpd/ 
    18 PKG_MD5SUM:=3afa8137dc1999be695a20b62fdf032b 
     18PKG_MD5SUM:=8d8d904e7342125825ec70f03c5745ef 
    1919 
    2020PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_NAME)-$(PKG_VERSION) 
     
    3838define Package/apache 
    3939$(call Package/apache/Default) 
    40   DEPENDS:=+libapr +libaprutil +zlib +libexpat +libpcre +libopenssl +libsqlite3 
     40  DEPENDS:=+libapr +libaprutil +libpcre +libopenssl 
    4141endef 
    4242 
     
    8686endef 
    8787 
    88 define Build/Configure   
     88define Build/Configure 
    8989        $(call Build/Configure/Default, \ 
    9090                --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \ 
     
    9999                --without-suexec-bin \ 
    100100                --sysconfdir=/etc/apache \ 
    101                 ap_void_ptr_lt_long=no \ 
     101                ap_cv_void_ptr_lt_long=no \ 
    102102                logfiledir="/var/log" \ 
    103103        ) 
    104104endef 
    105105 
    106 define Build/Compile     
     106define Build/Compile 
    107107        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    108108                DESTDIR="$(PKG_INSTALL_DIR)" \ 
     
    139139define Package/apache/install 
    140140        $(INSTALL_DIR) $(1)/usr/sbin 
    141         # we don't need apxs on the router, it's just for building apache modules.   
     141        # we don't need apxs on the router, it's just for building apache modules. 
    142142        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{ab,apachectl,checkgid,dbmmanage,envvars,envvars-std,htcacheclean,htdbm,htdigest,htpasswd,httpd,httxt2dbm,logresolve,rotatelogs} $(1)/usr/sbin/ 
    143143        $(INSTALL_DIR) $(1)/usr/lib 
     
    146146        $(CP) $(PKG_INSTALL_DIR)/usr/share/{error,htdocs,cgi-bin,build} $(1)/usr/share/ 
    147147        $(INSTALL_DIR) $(1)/etc/apache 
    148         $(CP) $(PKG_INSTALL_DIR)/etc/apache/{magic,mime.types,extra} $(1)/etc/apache/ 
    149         $(CP) ./files/etc/apache/httpd.conf $(1)/etc/apache/ 
     148        $(CP) $(PKG_INSTALL_DIR)/etc/apache/{httpd.conf,magic,mime.types,extra} $(1)/etc/apache/ 
    150149endef 
    151150 
  • packages/net/apache/patches/001-Makefile_in.patch

    r11653 r17645  
    11--- a/server/Makefile.in 
    22+++ b/server/Makefile.in 
    3 @@ -26,7 +26,10 @@ 
     3@@ -26,7 +26,10 @@ gen_test_char: $(gen_test_char_OBJECTS) 
    44        $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) 
    55  
  • packages/net/apache/patches/002-test_char_h.patch

    r11653 r17645  
    2323+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54, 
    2424+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54, 
    25 +    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54  
     25+    54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54 
    2626+}; 
  • packages/net/apache/patches/003-logdir_fix.patch

    r11653 r17645  
    11--- a/build/mkconfNW.awk 
    22+++ b/build/mkconfNW.awk 
    3 @@ -24,7 +24,7 @@ 
     3@@ -24,7 +24,7 @@ BEGIN { 
    44     A["sysconfdir"] = "conf" 
    55     A["iconsdir"] = "icons" 
  • packages/net/apache/patches/004-pidfile_fix.patch

    r11653 r17645  
    11--- a/include/scoreboard.h 
    22+++ b/include/scoreboard.h 
    3 @@ -42,7 +42,7 @@ 
     3@@ -42,7 +42,7 @@ extern "C" { 
    44  
    55 /* Scoreboard file, if there is one */ 
Note: See TracChangeset for help on using the changeset viewer.