summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/firefox/Makefile14
-rw-r--r--package/lighttpd/Makefile3
-rw-r--r--package/lighttpd/files/lighttpd.conf6
-rw-r--r--package/lighttpd/files/lighttpd.conffiles1
-rw-r--r--package/lighttpd/files/lighttpd.init3
-rw-r--r--package/lighttpd/files/lighttpd.postinst3
-rw-r--r--package/lighttpd/files/modules.conf172
-rw-r--r--package/openldap/Makefile6
-rw-r--r--package/php/Makefile4
9 files changed, 195 insertions, 17 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 6d583cc60..05a6c007b 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -4,16 +4,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= firefox
-PKG_VERSION:= 3.6.13
+PKG_VERSION:= 3.6.14
PKG_RELEASE:= 1
-PKG_MD5SUM:= d7c90aed8209beefa74badf02e8eeae1
+PKG_MD5SUM:= ab0d00cd33e6b2388429dda1c01abd01
PKG_DESCR:= graphical webbrowser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify
-PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx
+PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx
PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf
PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
-PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite
+PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk
PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
PKG_NOPARALLEL:= 1
@@ -27,7 +27,7 @@ WRKDIST= ${WRKDIR}/mozilla-1.9.2
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
ifeq (${ADK_LINUX_MIPS64EL},y)
CONFIGURE_ARGS+= --disable-ipc
@@ -75,11 +75,11 @@ CONFIGURE_ARGS+= --enable-application=browser \
XAKE_FLAGS+= OS_RELEASE="2.6"
XAKE_FLAGS+= ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
-post-install:
+firefox-install:
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/lib
$(CP) $(WRKINST)/usr/lib/firefox-${PKG_VERSION} \
- $(IDIR_FIREFOX)/usr/lib/
+ $(IDIR_FIREFOX)/usr/lib
$(CP) $(WRKINST)/usr/bin/firefox \
$(IDIR_FIREFOX)/usr/bin
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 351797045..b043b944f 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= lighttpd
PKG_VERSION:= 1.4.28
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 202d36efc6324adb95a3600d2826ec6a
PKG_DESCR:= a lightweight web server
PKG_SECTION:= www
@@ -88,6 +88,7 @@ CONFIGURE_ARGS+= --libdir=/usr/lib/lighttpd \
post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
${INSTALL_DATA} ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/lighttpd
+ ${INSTALL_DATA} ./files/modules.conf $(IDIR_LIGHTTPD)/etc/lighttpd
${CP} ${WRKBUILD}/doc/config/conf.d/*.conf \
$(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/lib/lighttpd
diff --git a/package/lighttpd/files/lighttpd.conf b/package/lighttpd/files/lighttpd.conf
index efe96be4f..3c114d35f 100644
--- a/package/lighttpd/files/lighttpd.conf
+++ b/package/lighttpd/files/lighttpd.conf
@@ -90,7 +90,7 @@ server.port = 80
##
## Use IPv6?
##
-server.use-ipv6 = "enable"
+server.use-ipv6 = "disable"
##
## bind to a specific IP
@@ -188,7 +188,7 @@ server.event-handler = "linux-sysepoll"
## linux-sendfile - is recommended for small files.
## writev - is recommended for sending many large files
##
-server.network-backend = "linux-sendfile"
+#server.network-backend = "linux-sendfile"
##
## As lighttpd is a single-threaded server, its main resource limit is
@@ -305,7 +305,7 @@ index-file.names += (
## ~ is for backupfiles from vi, emacs, joe, ...
## .inc is often used for code includes which should in general not be part
## of the document-root
-url.access-deny = ( "~", ".inc" )
+#url.access-deny = ( "~", ".inc" )
##
## disable range requests for pdf files
diff --git a/package/lighttpd/files/lighttpd.conffiles b/package/lighttpd/files/lighttpd.conffiles
index 29b503c6c..06ac9cb98 100644
--- a/package/lighttpd/files/lighttpd.conffiles
+++ b/package/lighttpd/files/lighttpd.conffiles
@@ -1 +1,2 @@
/etc/lighttpd/lighttpd.conf
+/etc/lighttpd/modules.conf
diff --git a/package/lighttpd/files/lighttpd.init b/package/lighttpd/files/lighttpd.init
index cb0a117d9..8e2d897af 100644
--- a/package/lighttpd/files/lighttpd.init
+++ b/package/lighttpd/files/lighttpd.init
@@ -1,7 +1,6 @@
#!/bin/sh
#PKG lighttpd
#INIT 60
-
. /etc/rc.conf
case $1 in
@@ -11,6 +10,8 @@ autostart)
exec sh $0 start
;;
start)
+ [ ! -d /srv/www ] && echo "You need to create /srv/www/htdocs"
+ mkdir -p /var/log/lighttpd && chown lighttpd.lighttpd /var/log/lighttpd
/usr/sbin/lighttpd $lighttpd_flags
;;
stop)
diff --git a/package/lighttpd/files/lighttpd.postinst b/package/lighttpd/files/lighttpd.postinst
index e77dadeee..559ccb61c 100644
--- a/package/lighttpd/files/lighttpd.postinst
+++ b/package/lighttpd/files/lighttpd.postinst
@@ -2,3 +2,6 @@
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf lighttpd lighttpd NO
add_rcconf lighttpd_flags lighttpd_flags "-f /etc/lighttpd/lighttpd.conf"
+gid=$(get_next_gid)
+add_user lighttpd $(get_next_uid) $gid /srv/www
+add_group lighttpd $gid
diff --git a/package/lighttpd/files/modules.conf b/package/lighttpd/files/modules.conf
new file mode 100644
index 000000000..f05a821dc
--- /dev/null
+++ b/package/lighttpd/files/modules.conf
@@ -0,0 +1,172 @@
+#######################################################################
+##
+## Modules to load
+## -----------------
+##
+## at least mod_access and mod_accesslog should be loaded
+## all other module should only be loaded if really neccesary
+##
+## - saves some time
+## - saves memory
+##
+## the default module set contains:
+##
+## "mod_indexfile", "mod_dirlisting", "mod_staticfile"
+##
+## you dont have to include those modules in your list
+##
+## Modules, which are pulled in via conf.d/*.conf
+##
+## NOTE: the order of modules is important.
+##
+## - mod_accesslog -> conf.d/access_log.conf
+## - mod_compress -> conf.d/compress.conf
+## - mod_status -> conf.d/status.conf
+## - mod_webdav -> conf.d/webdav.conf
+## - mod_cml -> conf.d/cml.conf
+## - mod_evhost -> conf.d/evhost.conf
+## - mod_simple_vhost -> conf.d/simple_vhost.conf
+## - mod_mysql_vhost -> conf.d/mysql_vhost.conf
+## - mod_trigger_b4_dl -> conf.d/trigger_b4_dl.conf
+## - mod_userdir -> conf.d/userdir.conf
+## - mod_rrdtool -> conf.d/rrdtool.conf
+## - mod_ssi -> conf.d/ssi.conf
+## - mod_cgi -> conf.d/cgi.conf
+## - mod_scgi -> conf.d/scgi.conf
+## - mod_fastcgi -> conf.d/fastcgi.conf
+## - mod_proxy -> conf.d/proxy.conf
+## - mod_secdownload -> conf.d/secdownload.conf
+## - mod_expire -> conf.d/expire.conf
+##
+
+server.modules = (
+# "mod_access",
+# "mod_alias",
+# "mod_auth",
+# "mod_evasive",
+# "mod_redirect",
+# "mod_rewrite",
+# "mod_setenv",
+# "mod_usertrack",
+)
+
+##
+#######################################################################
+
+#######################################################################
+##
+## Config for various Modules
+##
+
+##
+## mod_ssi
+##
+#include "conf.d/ssi.conf"
+
+##
+## mod_status
+##
+#include "conf.d/status.conf"
+
+##
+## mod_webdav
+##
+#include "conf.d/webdav.conf"
+
+##
+## mod_compress
+##
+#include "conf.d/compress.conf"
+
+##
+## mod_userdir
+##
+#include "conf.d/userdir.conf"
+
+##
+## mod_magnet
+##
+#include "conf.d/magnet.conf"
+
+##
+## mod_cml
+##
+#include "conf.d/cml.conf"
+
+##
+## mod_rrdtool
+##
+#include "conf.d/rrdtool.conf"
+
+##
+## mod_proxy
+##
+#include "conf.d/proxy.conf"
+
+##
+## mod_expire
+##
+#include "conf.d/expire.conf"
+
+##
+## mod_secdownload
+##
+#include "conf.d/secdownload.conf"
+
+##
+#######################################################################
+
+#######################################################################
+##
+## CGI modules
+##
+
+##
+## SCGI (mod_scgi)
+##
+#include "conf.d/scgi.conf"
+
+##
+## FastCGI (mod_fastcgi)
+##
+#include "conf.d/fastcgi.conf"
+
+##
+## plain old CGI (mod_cgi)
+##
+#include "conf.d/cgi.conf"
+
+##
+#######################################################################
+
+#######################################################################
+##
+## VHost Modules
+##
+## Only load ONE of them!
+## ========================
+##
+
+##
+## You can use conditionals for vhosts aswell.
+##
+## see http://www.lighttpd.net/documentation/configuration.html
+##
+
+##
+## mod_evhost
+##
+#include "conf.d/evhost.conf"
+
+##
+## mod_simple_vhost
+##
+#include "conf.d/simple_vhost.conf"
+
+##
+## mod_mysql_vhost
+##
+#include "conf.d/mysql_vhost.conf"
+
+##
+#######################################################################
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index c543380d3..7c420b456 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openldap
-PKG_VERSION:= 2.4.23
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 90150b8c0d0192e10b30157e68844ddf
+PKG_VERSION:= 2.4.24
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 116fe1e23a7b67686d5e62274367e6c0
PKG_DESCR:= OpenLDAP client libraries
PKG_SECTION:= libs
PKG_DEPENDS:= libopenssl libsasl2
diff --git a/package/php/Makefile b/package/php/Makefile
index ade1203b3..2196c4f92 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -194,8 +194,8 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php
${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc
${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc
- ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/sbin
+ ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/bin
${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \
- $(IDIR_PHP_FASTCGI)/usr/sbin/php
+ $(IDIR_PHP_FASTCGI)/usr/bin/php
include ${TOPDIR}/mk/pkg-bottom.mk
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 12:07:48 +0000