hwoarang    14/03/12 18:11:11

  Modified:             ChangeLog
  Added:                lighttpd-1.4.35.ebuild
  Log:
  Version bump. Bug #504330
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
C2BA7F3C!)

Revision  Changes    Path
1.322                www-servers/lighttpd/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.322&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.322&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/ChangeLog?r1=1.321&r2=1.322

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -r1.321 -r1.322
--- ChangeLog   25 Jan 2014 16:21:54 -0000      1.321
+++ ChangeLog   12 Mar 2014 18:11:11 -0000      1.322
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.321 
2014/01/25 16:21:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.322 
2014/03/12 18:11:11 hwoarang Exp $
+
+*lighttpd-1.4.35 (12 Mar 2014)
+
+  12 Mar 2014; Markos Chandras <hwoar...@gentoo.org> +lighttpd-1.4.35.ebuild:
+  Version bump. Bug #504330
 
   25 Jan 2014; Markos Chandras <hwoar...@gentoo.org> lighttpd-1.4.34.ebuild:
   Update Manifest because upstream has changed the tarball after the initial



1.1                  www-servers/lighttpd/lighttpd-1.4.35.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.35.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.35.ebuild?rev=1.1&content-type=text/plain

Index: lighttpd-1.4.35.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.35.ebuild,v 1.1 
2014/03/12 18:11:11 hwoarang Exp $

EAPI="4"
inherit base autotools eutils depend.php readme.gentoo user systemd

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 GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~sparc-fbsd ~x86-fbsd"
IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache 
mysql pcre php rrdtool selinux ssl test uploadprogress webdav xattr zlib"

REQUIRED_USE="kerberos? ( ssl )"

RDEPEND="
        bzip2?    ( app-arch/bzip2 )
        fam?      ( virtual/fam )
        gdbm?     ( sys-libs/gdbm )
        ldap?     ( >=net-nds/openldap-2.1.26 )
        libev?    ( >=dev-libs/libev-4.01 )
        lua?      ( >=dev-lang/lua-5.1 )
        memcache? ( dev-libs/libmemcache )
        mysql?    ( >=virtual/mysql-4.0 )
        pcre?     ( >=dev-libs/libpcre-3.1 )
        php?      ( dev-lang/php[cgi] )
        rrdtool?  ( net-analyzer/rrdtool )
        selinux? ( sec-policy/selinux-apache )
        ssl?    ( >=dev-libs/openssl-0.9.7[kerberos?] )
        webdav? (
                dev-libs/libxml2
                >=dev-db/sqlite-3
                sys-fs/e2fsprogs
        )
        xattr? ( kernel_linux? ( sys-apps/attr ) )
        zlib? ( >=sys-libs/zlib-1.1 )"

DEPEND="${RDEPEND}
        virtual/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="${D}/etc/lighttpd/lighttpd.conf"

        # enable php/mod_fastcgi settings
        use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || 
die; }

        # enable stat() caching
        use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }

        # automatically listen on IPv6 if built with USE=ipv6. Bug #234987
        use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' 
${config} || die; }
}

# 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.*
        use zlib    || rm -f ${libdir}/mod_compress.*
}

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."
        fi
        if use mmap; then
                ewarn "You have enabled the mmap option. This option may allow"
                ewarn "local users to trigger SIGBUG crashes. Use this option"
                ewarn "with EXTRA care."
        fi
        enewgroup lighttpd
        enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd

        DOC_CONTENTS="IPv6 migration guide:\n
                http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config";
}

src_prepare() {
        base_src_prepare
        #dev-python/docutils installs rst2html.py not rst2html
        sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
                die "sed doc/Makefile.am failed"
        # Experimental patch for progress bar. Bug #380093
        if use uploadprogress; then
            epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch
        fi
        eautoreconf
}

src_configure() {
        econf --libdir=/usr/$(get_libdir)/${PN} \
                --enable-lfs \
                $(use_enable ipv6) \
                $(use_enable mmap) \
                $(use_with bzip2) \
                $(use_with fam) \
                $(use_with gdbm) \
                $(use_with kerberos kerberos5) \
                $(use_with ldap) \
                $(use_with libev) \
                $(use_with lua) \
                $(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) \
                $(use_with zlib)
}

src_compile() {
        emake

        if use doc ; then
                einfo "Building HTML documentation"
                cd doc || die
                emake html
        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() {
        emake DESTDIR="${D}" install

        # init script stuff
        newinitd "${FILESDIR}"/lighttpd.initd lighttpd
        newconfd "${FILESDIR}"/lighttpd.confd lighttpd
        use fam && has_version app-admin/fam && \
                { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd 
|| die; }

        # 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

        # update lighttpd.conf directives based on conditionals
        update_config

        # docs
        dodoc AUTHORS README NEWS doc/scripts/*.sh
        newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
        use ipv6 && readme.gentoo_create_doc

        use doc && dohtml -r doc/*

        docinto txt
        dodoc doc/outdated/*.txt

        # logrotate
        insinto /etc/logrotate.d
        newins "${FILESDIR}"/lighttpd.logrotate lighttpd

        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

        systemd_dounit "${FILESDIR}/${PN}.service"
        systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
}

pkg_postinst () {
        use ipv6 && readme.gentoo_print_elog

        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."
        fi

        if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
                elog "Gentoo has a customized configuration,"
                elog "which is now located in /etc/lighttpd.  Please migrate 
your"
                elog "existing configuration."
        fi

        if use uploadprogress; then
                elog "WARNING! mod_uploadprogress is a backported module from 
the"
                elog "1.5x-branch, which is not considered stable yet. Please 
go to"
                elog "http://redmine.lighttpd.net/wiki/1/Docs:ModUploadProgress";
                elog "for more information. This configuration also is NOT 
supported"
                elog "by upstream, so please refrain from reporting bugs. You 
have"
                elog "been warned!"
        fi
}




Reply via email to