add patch which fixes ssl support for newer versions of openssl (bug #308405)
authorThilo Bangert <bangert@gentoo.org>
Sun, 14 Mar 2010 21:33:12 +0000 (21:33 +0000)
committerThilo Bangert <bangert@gentoo.org>
Sun, 14 Mar 2010 21:33:12 +0000 (21:33 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux i686

www-servers/lighttpd/ChangeLog
www-servers/lighttpd/Manifest
www-servers/lighttpd/files/1.4.26-fix-ssl-return-check-r2716.patch [new file with mode: 0644]
www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild [new file with mode: 0644]

index 4f9a81f0a6f66059a9045a383c427bc90d9d83c2..163da6837e7801df69373396d62afa7508c2acd0 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.224 2010/02/09 23:18:25 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.225 2010/03/14 21:33:11 bangert Exp $
+
+*lighttpd-1.4.26-r1 (14 Mar 2010)
+
+  14 Mar 2010; Thilo Bangert <bangert@gentoo.org>
+  +files/1.4.26-fix-ssl-return-check-r2716.patch,
+  +lighttpd-1.4.26-r1.ebuild:
+  add patch which fixes ssl support for newer versions of openssl (bug
+  #308405)
 
 *lighttpd-1.4.26 (09 Feb 2010)
 
index f6b1e0aef75a96b32bb3bcde389590d866298373..f054331142a4f83d9eec0483eea60283ddfedabc 100644 (file)
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.25-fix-CVE-2010-0295.patch 6237 RMD160 cd9ce4410ed805d28899b0207bbc670e04491315 SHA1 2ba33d94f5628d97cb606ad97ef9630eef5191c4 SHA256 d4d269d993396cfd9146de621e0a3d5e9203ac7f6b2b6f351f9013dbbe956a4e
 AUX 1.4.25-fix-unknown-AM_SILENT_RULES.patch 744 RMD160 5da8bdca1728f2de730e90de4fb7e93a274406e8 SHA1 8ae6849a88aaaca76c1b8c13a62cc266dbebc2a7 SHA256 a1cf7c77b7ee1cbe9bf3efbb7704b8582c480ae69fd70934597d24ff3fddf663
+AUX 1.4.26-fix-ssl-return-check-r2716.patch 562 RMD160 81b5fc8f13e3fbca8a48fd1f954ae7e165b261b1 SHA1 60c3665d0a4f46df1da80338970c7ce6efab64fe SHA256 28391235c48d4dc686d060bbafd711e028a07b68065f40346dc40ca242f4285c
 AUX conf/lighttpd.conf 8243 RMD160 0b99dbb49be34521ddda14abd9b06cef141bbfc9 SHA1 8fd27dd9b5aea94ca0d1611c8fb1d9e3cb720d0b SHA256 3c016c663d14bf1cb8bf1c7d87dc0ecc1fb4f189ebd4fb05e90ed23f20439ed5
 AUX conf/mime-types.conf 3350 RMD160 ca82154e69af26b1d9de9757d5bcbe69eb428dcb SHA1 f7b7c19a90629b6598a1c4769592628fa582dd34 SHA256 8bbab2136c71878fbca5ad8d45838a99fd278037406049a3cca5f47d81309100
 AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf
@@ -20,13 +18,7 @@ DIST lighttpd-1.4.26.tar.bz2 627971 RMD160 2d294083fbcd4040dc8efec06090cf1c1bf66
 EBUILD lighttpd-1.4.23.ebuild 5785 RMD160 9329db0ea573b13e5764c6a173b5af3f53bb5d0b SHA1 674020a06fa14101d24faf13ebe034ef7a852358 SHA256 5ab87c04a35cb8a00460150402ddd82586e7f0e3eea8381dd0738ee69d73f459
 EBUILD lighttpd-1.4.25-r1.ebuild 5876 RMD160 5634e49a7eef011d5ae68a9c804df24e36b3f442 SHA1 e1fec940f7ad0d6dab262a91fdb82d726eb2ce5d SHA256 ec001e91cd40d3793d34d8d6aabc411d0f6bddbd34b8335efdde09258d4b33c1
 EBUILD lighttpd-1.4.25.ebuild 5829 RMD160 365b1ea4415d2667fcef3a7af08fec29edcf596f SHA1 002a05ab99b4f3c15c8da95fa764fbfb8d84757c SHA256 cc5b0e4170cf4ef91b8043504c4b28e677c5d0d92039cbbe897c00d1a61bcce5
+EBUILD lighttpd-1.4.26-r1.ebuild 5836 RMD160 c45d54649e8ed5112213b0977c7ed581a8d0f30c SHA1 eadcff54e3a612d774e1372e61de6e9240a41127 SHA256 aa96b41f0e67bb0d70b5612a783df29d846c525401a37523bbed637d51a48be5
 EBUILD lighttpd-1.4.26.ebuild 5770 RMD160 163db40627952a781db876216682589e7e493789 SHA1 c3c430d49799fa2644dbdd07833d0a42f8065efd SHA256 0a990bb6fa0cbb78ef493807d59badafb9d7e83cb54fc7d31b65ad3748ec371d
-MISC ChangeLog 50039 RMD160 2e0e1d5fb93c3ffd6d19e4a564f2189c175676f7 SHA1 86682ea23c7742c75ddc186bc6b751c5a7f107e2 SHA256 ff37fe35e56431581a52c2c68cdc5fdfc12982b2bf7e4469c49563ce86aa3a28
+MISC ChangeLog 50288 RMD160 3e390a36d7c00a998be34fb8a882498ed3cf85ee SHA1 45222bb0615375e2ba36272135ef458ce0d01c29 SHA256 c37c25dc46c5fb31be08d9e463a01fd6391f0c210a816e1e7087dc10ff40de68
 MISC metadata.xml 927 RMD160 3d969f099d1bb8df70ec5f8ed78a83ad27d2b10d SHA1 1e564c4fc4edb8a4b2dc41f731071ec38e917027 SHA256 479db26201c5c934fd5fb5deccd8712a637114d5cde6e75da8ce9ad4872ec070
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktx7UcACgkQSamB34AN3N5brgCfc38euZhAAJuUxHtjiymhYbQh
-00UAnRPb7s0IGj+S43UUwNKatEtXaFtM
-=teeR
------END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/1.4.26-fix-ssl-return-check-r2716.patch b/www-servers/lighttpd/files/1.4.26-fix-ssl-return-check-r2716.patch
new file mode 100644 (file)
index 0000000..1ef8a1c
--- /dev/null
@@ -0,0 +1,16 @@
+fix check of return value
+from upstream svn repo
+
+Index: network.c
+===================================================================
+--- src/network.c      (revision 2715)
++++ src/network.c      (revision 2716)
+@@ -525,7 +525,7 @@
+ 
+               if (!s->ssl_use_sslv2) {
+                       /* disable SSLv2 */
+-                      if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
++                      if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
+                               log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
+                                               ERR_error_string(ERR_get_error(), NULL));
+                               return -1;
diff --git a/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild
new file mode 100644 (file)
index 0000000..4518979
--- /dev/null
@@ -0,0 +1,212 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.26-r1.ebuild,v 1.1 2010/03/14 21:33:11 bangert Exp $
+
+EAPI="2"
+
+inherit eutils autotools depend.php
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
+
+RDEPEND="
+       >=sys-libs/zlib-1.1
+       bzip2?    ( app-arch/bzip2 )
+       fam?      ( virtual/fam )
+       gdbm?     ( sys-libs/gdbm )
+       ldap?     ( >=net-nds/openldap-2.1.26 )
+       lua?      ( >=dev-lang/lua-5.1 )
+       memcache? ( dev-libs/libmemcache )
+       mysql?    ( >=virtual/mysql-4.0 )
+       pcre?     ( >=dev-libs/libpcre-3.1 )
+       php?      ( virtual/httpd-php )
+       rrdtool?  ( net-analyzer/rrdtool )
+       ssl?    ( >=dev-libs/openssl-0.9.7 )
+       webdav? (
+               dev-libs/libxml2
+               >=dev-db/sqlite-3
+               sys-fs/e2fsprogs
+       )
+       xattr? ( kernel_linux? ( sys-apps/attr ) )"
+
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       doc?  ( dev-python/docutils )
+       test? (
+               virtual/perl-Test-Harness
+               dev-libs/fcgi
+       )"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+       local config="/etc/lighttpd/lighttpd.conf"
+
+       # enable php/mod_fastcgi settings
+       use php && \
+               dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
+
+       # enable stat() caching
+       use fam && \
+               dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+       local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+       # text docs
+       use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+       # non-essential modules
+       rm -f \
+               ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+
+       # allow users to keep some based on USE flags
+       use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+       use webdav  || rm -f ${libdir}/mod_webdav.*
+       use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+       use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+       use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+
+       if ! use fastcgi ; then
+               rm -f ${libdir}/mod_fastcgi.*
+       fi
+}
+
+pkg_setup() {
+       if ! use pcre ; then
+               ewarn "It is highly recommended that you build ${PN}"
+               ewarn "with perl regular expressions support via USE=pcre."
+               ewarn "Otherwise you lose support for some core options such"
+               ewarn "as conditionals and modules such as mod_re{write,direct}"
+               ewarn "and mod_ssi."
+               ebeep 5
+       fi
+
+       use php && require_php_with_use cgi
+
+       enewgroup lighttpd
+       enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+}
+
+src_prepare() {
+       # dev-python/docutils installs rst2html.py not rst2html
+       sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
+               die "sed doc/Makefile.am failed"
+
+       epatch "${FILESDIR}/1.4.26-fix-ssl-return-check-r2716.patch"
+       eautoreconf
+}
+
+src_configure() {
+       econf --libdir=/usr/$(get_libdir)/${PN} \
+               --enable-lfs \
+               $(use_enable ipv6) \
+               $(use_with bzip2) \
+               $(use_with fam) \
+               $(use_with gdbm) \
+               $(use_with lua) \
+               $(use_with ldap) \
+               $(use_with memcache) \
+               $(use_with mysql) \
+               $(use_with pcre) \
+               $(use_with ssl openssl) \
+               $(use_with webdav webdav-props) \
+               $(use_with webdav webdav-locks) \
+               $(use_with xattr attr)
+}
+
+src_compile() {
+       emake || die "emake failed"
+
+       if use doc ; then
+               einfo "Building HTML documentation"
+               cd doc
+               emake html || die "failed to build HTML documentation"
+       fi
+}
+
+src_test() {
+       if [[ ${EUID} -eq 0 ]]; then
+               default_src_test
+       else
+               ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+       fi
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+
+       # init script stuff
+       newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
+       newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
+       use fam && has_version app-admin/fam && \
+               sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
+
+       # configs
+       insinto /etc/lighttpd
+       doins "${FILESDIR}"/conf/lighttpd.conf
+       doins "${FILESDIR}"/conf/mime-types.conf
+       doins "${FILESDIR}"/conf/mod_cgi.conf
+       doins "${FILESDIR}"/conf/mod_fastcgi.conf
+       # Secure directory for fastcgi sockets
+       keepdir /var/run/lighttpd/
+       fperms 0750 /var/run/lighttpd/
+       fowners lighttpd:lighttpd /var/run/lighttpd/
+
+       # update lighttpd.conf directives based on conditionals
+       update_config
+
+       # docs
+       dodoc AUTHORS README NEWS doc/*.sh
+       newdoc doc/lighttpd.conf lighttpd.conf.distrib
+
+       use doc && dohtml -r doc/*
+
+       docinto txt
+       dodoc doc/*.txt
+
+       # logrotate
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
+
+       keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+       fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+       fperms 0750 /var/l{ib,og}/lighttpd
+
+       #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+       rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
+
+       use minimal && remove_non_essential
+}
+
+pkg_postinst () {
+       echo
+       if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+               einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+               einfo "spawn-fcgi's init script configuration is now located"
+               einfo "at /etc/conf.d/spawn-fcgi."
+               echo
+       fi
+
+       if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+               ewarn "Gentoo has a customized configuration,"
+               ewarn "which is now located in /etc/lighttpd.  Please migrate your"
+               ewarn "existing configuration."
+               ebeep 5
+       fi
+
+       if use fastcgi; then
+               ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate"
+               ewarn "www-servers/spawn-fcgi package. Please install it manually, if"
+               ewarn "you use spawn-fcgi."
+               ewarn "It features a new, more featurefull init script - please migrate"
+               ewarn "your configuration!"
+       fi
+}