Mercurial > hg > portage
changeset 238:86a0cec24d06
Automated merge with http://hoho.dyndns.org/hg/portage
| author | Dirk Olmes <dirk@xanthippe.ping.de> |
|---|---|
| date | Wed, 11 Aug 2010 04:08:09 +0200 |
| parents | 2864788b37cf (diff) da2e11c54daa (current diff) |
| children | a588f50b1e1d |
| files | layman/.keep_app-portage_layman-0 net-misc/rabbitmq-server/Manifest |
| diffstat | 33 files changed, 1241 insertions(+), 708 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/eselect-maven/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,2 @@ +AUX maven-0.2.eselect 3756 RMD160 7103857aedf3f6a64b9caa470059853723113c8d SHA1 298e66372b96dcf266b8b6a351557c5ae11dd864 SHA256 4bb50475a8582ca7aacfc98c6a41731ccf3693e39044a90a9fb4926cf1425e50 +EBUILD eselect-maven-0.2.ebuild 768 RMD160 b273335d9414a25486a0cb21b077902ce0bb870e SHA1 2fb6284dd9736e8fc0fd6161ea3421c059d17453 SHA256 fd229fe63d4756f102b142153f004819239e985b91fa43265913cc63f2253472
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/eselect-maven/eselect-maven-0.2.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,30 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-maven/eselect-maven-0.2.ebuild,v 1.2 2010/04/26 07:50:50 phajdan.jr Exp $ + +EAPI=3 + +DESCRIPTION="Manages Maven symlinks" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="" + +RDEPEND=">=app-admin/eselect-1.2.8 + !<dev-java/maven-bin-2.0.10-r1:2.1" +PDEPEND=" +|| ( + dev-java/maven-bin:3.0 + dev-java/maven-bin:2.2 + dev-java/maven-bin:2.1 + dev-java/maven-bin:2.0 +)" + +src_install() { + insinto /usr/share/eselect/modules + newins "${FILESDIR}/maven-${PV}.eselect" maven.eselect \ + || die "newins failed" +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-admin/eselect-maven/files/maven-0.2.eselect Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,175 @@ +# -*-eselect-*- vim: ft=eselect +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id: maven-0.2.eselect,v 1.1 2010/02/28 19:31:04 ulm Exp $ + +DESCRIPTION="Manage Maven targets" +MAINTAINER="java@gentoo.org" +VERSION="0.2" + +MVN="${EROOT}/usr/bin/mvn" + +# find a list of mvn symlink targets, best first. +find_targets() { + for f in $(ls -r "${MVN}"-[0-9]* 2> /dev/null) ; do + if [[ -f "${f}" ]] ; then + echo $(basename "${f}") + fi + done +} + +# get a named or numbered target. +find_target() { + local target=${1} + + if is_number "${target}" && [[ ${target} -ge 1 ]] ; then + targets=( $(find_targets ) ) + [[ -z "${targets}" ]] && die -q "No targets found!" + target=${targets[target-1]} + fi + + if [[ "${target}" = mvn-[0-9]* ]] && [[ -f "${EROOT}/usr/bin/${target}" ]] ; then + echo ${target} + else + die -q "Target \"${1}\" doesn't appear to be valid!" + fi +} + +# try to remove the mvn symlink. +remove_symlink() { + rm "${MVN}" &>/dev/null +} + +# determine the current target. +get_target() { + local canonicalised=$(canonicalise "${MVN}") + echo $(basename "${canonicalised}") +} + +# set the Maven symlink. +set_symlink() { + local target=$(find_target "${1}") + remove_symlink + ln -s "${target}" "${MVN}" || die "Couldn't set ${target} symlink." +} + +### show action ### + +describe_show() { + echo "Show current Maven target" +} + +do_show() { + if [[ ${#} -gt 0 ]]; then + die -q "No parameters allowed." + fi + + if [[ -L "${MVN}" ]] ; then + get_target + return 0 + elif [[ -e "${MVN}" ]] ; then + echo "(not a symlink)" >&2 + return 1 + else + echo "(unset)" >&2 + return 1 + fi +} + +### list action ### + +describe_list() { + echo "List available Maven targets" +} + +do_list() { + if [[ ${#} -gt 0 ]]; then + die -q "Usage error: no parameters allowed." + fi + + local i targets + targets=( $(find_targets) ) + + for (( i = 0; i < ${#targets[@]}; i++ )); do + [[ ${targets[i]} = $(basename "$(canonicalise "${MVN}")") ]] \ + && targets[i]=$(highlight_marker "${targets[i]}") + done + + write_list_start "Available Maven targets:" + write_numbered_list -m "(none found)" "${targets[@]}" +} + +### set action ### + +describe_set() { + echo "Set a new Maven target" +} + +describe_set_options() { + echo "target : Target name or number (from 'list' action)" +} + +describe_set_parameters() { + echo "<target>" +} + +do_set() { + if [[ $# -gt 1 ]]; then + die -q "Too many parameters. Expected only one." + fi + + local target=${1} + + if [[ -z "${target}" ]] ; then + die -q "You didn't give me a target name or number." + elif [[ -L "${MVN}" ]] ; then + if ! remove_symlink ; then + die -q "Can't remove existing Maven provider." + elif ! set_symlink "${1}" ; then + die -q "Can't set new Maven provider." + fi + elif [[ -e "${MVN}" ]] ; then + write_warning_msg "Can't set a new Maven provider. There's a file in the way at ${MVN}. You can try removing it manually, and then re-running this command." + else + set_symlink "${target}" || die -q "Wasn't able to set a new provider." + fi +} + +### update action ### + +describe_update() { + echo "Set the Maven target to the latest if the current target is invalid or if the given target is the latest" +} + +describe_update_options() { + echo "target (optional) : Target name (from 'list' action)" +} + +describe_update_parameters() { + echo "<target>" +} + +do_update() { + if [[ $# -gt 1 ]] ; then + die -q "Too many parameters. Expected only one." + fi + + # For pkg_postrm + if [[ ! $(find_targets) ]]; then + remove_symlink + return + fi + + local canonicalised=$(canonicalise "${MVN}") + + if [[ ! -L "${MVN}" ]] || [[ ! -f "${canonicalised}" ]] ; then + do_set 1 + elif [[ -n "${1}" ]] ; then + # Check whether target name is valid. + find_target "${1}" > /dev/null + + if [[ "${1}" == "$(find_target 1)" ]] ; then + do_set 1 + fi + fi +}
--- a/dev-db/pgpool-II/Manifest Wed Aug 04 13:44:58 2010 +0200 +++ b/dev-db/pgpool-II/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -1,3 +1,3 @@ AUX pgpool-II.init 397 RMD160 982661c7ed406af8cee485aec125a3c28320d008 SHA1 b0433f446f98acd2ca82930f073c6fd886ce19a7 SHA256 fc1f92d95d198a4fa7a4ae3e0bbad5ba093667c068550bd6a18bc86ab61252fa -DIST pgpool-II-2.3.1.tar.gz 961675 RMD160 adfeb49ae04fc765b221b9232e1285d3f922e8d3 SHA1 877832eb777e0ab49feed24444a55fab3ff583b4 SHA256 2a404dd3965c5d869c17ab0c031395a43445d6fcf0c72df8bd78d9629b8ed25b -EBUILD pgpool-II-2.3.1.ebuild 994 RMD160 7dd43fe7afbc7f84bdf5116282b7579a5bbb8107 SHA1 df1cba24be1f85459bfceca27d35e6ebb2dfa510 SHA256 57d1f158ac7c312a458810bdb73241bf71d767b3471407609a305d0900245385 +DIST pgpool-II-2.3.3.tar.gz 961675 RMD160 adfeb49ae04fc765b221b9232e1285d3f922e8d3 SHA1 877832eb777e0ab49feed24444a55fab3ff583b4 SHA256 2a404dd3965c5d869c17ab0c031395a43445d6fcf0c72df8bd78d9629b8ed25b +EBUILD pgpool-II-2.3.3.ebuild 994 RMD160 7dd43fe7afbc7f84bdf5116282b7579a5bbb8107 SHA1 df1cba24be1f85459bfceca27d35e6ebb2dfa510 SHA256 57d1f158ac7c312a458810bdb73241bf71d767b3471407609a305d0900245385
--- a/dev-db/pgpool-II/pgpool-II-2.3.1.ebuild Wed Aug 04 13:44:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -DESCRIPTION="New generation connection pool server for PostgreSQL" -HOMEPAGE="http://pgpool.projects.postgresql.org/" -SRC_URI="http://pgfoundry.org/frs/download.php/2108/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -DEPEND="virtual/postgresql-base" - -src_unpack() { - unpack ${A} - S="${WORKDIR}/${PN}-2.2" - cd ${S} - sed -i -e "/^logdir/s:/tmp:/var/run:g" pgpool.conf.sample || die -} - -src_compile() { - econf || die - emake || die -} - -src_install () { - einstall || die - mv ${D}/etc/pcp.conf.sample ${D}/etc/pcp.conf - mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf - mv ${D}/etc/pool_hba.conf.sample ${D}/etc/pool_hba.conf - dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO - newinitd "${FILESDIR}/pgpool-II.init" pgpool-II || die "Inserting init.d-file failed" -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/pgpool-II/pgpool-II-2.3.3.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,34 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="New generation connection pool server for PostgreSQL" +HOMEPAGE="http://pgpool.projects.postgresql.org/" +SRC_URI="http://pgfoundry.org/frs/download.php/2108/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="" + +DEPEND="virtual/postgresql-base" + +src_unpack() { + unpack ${A} + S="${WORKDIR}/${PN}-2.2" + cd ${S} + sed -i -e "/^logdir/s:/tmp:/var/run:g" pgpool.conf.sample || die +} + +src_compile() { + econf || die + emake || die +} + +src_install () { + einstall || die + mv ${D}/etc/pcp.conf.sample ${D}/etc/pcp.conf + mv ${D}/etc/pgpool.conf.sample ${D}/etc/pgpool.conf + mv ${D}/etc/pool_hba.conf.sample ${D}/etc/pool_hba.conf + dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO + newinitd "${FILESDIR}/pgpool-II.init" pgpool-II || die "Inserting init.d-file failed" +}
--- a/dev-java/maven-bin/Manifest Wed Aug 04 13:44:58 2010 +0200 +++ b/dev-java/maven-bin/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -1,2 +1,2 @@ -DIST apache-maven-3.0-beta-1-bin.tar.gz 2589687 RMD160 0d8e9576a9b330bd759ec741b05011ad0f48ff5a SHA1 639ada216287e1f2689e5e142f1e21aa7560d3d2 SHA256 934503ece96b3def22f13d07dc5c78e990cacc971175d9f8a9850457e39bf7c5 -EBUILD maven-bin-3.0.0_beta1.ebuild 1066 RMD160 f32d6aa46380119f7ace75a2472cb3565b9fdf52 SHA1 27952f33ac686911787efa9b8180bf6f30c0275f SHA256 639a3fd3813c5e558985d22848e2fd637e6979954e6dec36673bd1bf7bff79e6 +DIST apache-maven-3.0-beta-2-bin.tar.gz 2664069 RMD160 4240c480e6cd96df4ac114054d74ee400e34fe46 SHA1 0b39a8586b8979808e582faf332abf71456e9ad1 SHA256 6ee65e96244a05e8f43a840590c5e3e72822410dc9a68d282f168c8d8136ad15 +EBUILD maven-bin-3.0.0_beta2.ebuild 1066 RMD160 18a6b1c6f6d3f77b6d45fe103033f76281b5ddb1 SHA1 131f4e088498298376192203ddf9bb1ecfb97f55 SHA256 84d0191aa8d980cb21d7258b2d1dcba80403181f3986f13faa816442c23a5246
--- a/dev-java/maven-bin/maven-bin-3.0.0_beta1.ebuild Wed Aug 04 13:44:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1.ebuild,v 1.3 2010/04/26 11:05:56 phajdan.jr Exp $ - -inherit java-pkg-2 -inherit versionator - -MY_P="apache-maven-3.0-beta-1" - -DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz" -HOMEPAGE="http://maven.apache.org/" -LICENSE="Apache-2.0" -SLOT="3.0" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND=">=virtual/jdk-1.5 - app-admin/eselect-maven" - -IUSE="" - -S="${WORKDIR}/${MY_P}" - -MAVEN=${PN}-${SLOT} -MAVEN_SHARE="/usr/share/${MAVEN}" - -src_unpack() { - unpack ${A} - - rm -v "${S}"/bin/*.bat || die -} - -# TODO we should use jars from packages, instead of what is bundled -src_install() { - dodir "${MAVEN_SHARE}" - cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy" - - java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar - - dodoc NOTICE.txt README.txt || die - - dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/maven-bin/maven-bin-3.0.0_beta2.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,44 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-2.2.1.ebuild,v 1.3 2010/04/26 11:05:56 phajdan.jr Exp $ + +inherit java-pkg-2 +inherit versionator + +MY_P="apache-maven-3.0-beta-2" + +DESCRIPTION="Project Management and Comprehension Tool for Java" +SRC_URI="mirror://apache/maven/binaries/${MY_P}-bin.tar.gz" +HOMEPAGE="http://maven.apache.org/" +LICENSE="Apache-2.0" +SLOT="3.0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=">=virtual/jdk-1.5 + app-admin/eselect-maven" + +IUSE="" + +S="${WORKDIR}/${MY_P}" + +MAVEN=${PN}-${SLOT} +MAVEN_SHARE="/usr/share/${MAVEN}" + +src_unpack() { + unpack ${A} + + rm -v "${S}"/bin/*.bat || die +} + +# TODO we should use jars from packages, instead of what is bundled +src_install() { + dodir "${MAVEN_SHARE}" + cp -Rp bin boot conf lib "${D}/${MAVEN_SHARE}" || die "failed to copy" + + java-pkg_regjar "${D}/${MAVEN_SHARE}"/lib/*.jar + + dodoc NOTICE.txt README.txt || die + + dodir /usr/bin + dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mail-filter/imapfilter/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,2 @@ +DIST imapfilter-2.2.2.tar.bz2 45670 RMD160 c80dfa41af55fd7968f0c018825af4c6ba385397 SHA1 f201d166f5a483a2d8117bf2cbd0678b94e4753d SHA256 b3d56edc443d46ac711c44f286bfd3649483f686155faaa016dfa1f5a576c1f9 +EBUILD imapfilter-2.2.2.ebuild 917 RMD160 1a2071be67a843f23e8e3b4424e6921c477f376b SHA1 29cd12867db34943c7112fbd8b0496587d2642d5 SHA256 21ecfabccfac0202d879a2e6dc2db364b363a625fa3377037e59edaea92dd4b4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mail-filter/imapfilter/imapfilter-2.2.2.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,30 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-2.0.11.ebuild,v 1.1 2009/10/23 10:35:24 tove Exp $ + +inherit toolchain-funcs + +DESCRIPTION="An IMAP mail filtering utility" +HOMEPAGE="http://imapfilter.hellug.gr" +SRC_URI="http://imapfilter.hellug.gr/source/${P}.tar.bz2" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND="dev-libs/openssl + dev-libs/libpcre + >=dev-lang/lua-5.1" +DEPEND="${RDEPEND}" + +src_compile() { + # econf not possible + ./configure -p /usr -b /usr/bin -s /usr/share/imapfilter -m /usr/share/man || die "configure failed" + emake MYCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "parallel make failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc NEWS README sample.config.lua sample.extend.lua || die "dodoc failed" +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-analyzer/mrtg/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,5 @@ +AUX mrtg.confd 512 RMD160 ad2824f21df0ecf864b53250b1e50912b1f17777 SHA1 b3248d27b94155f14240c9d4151c5a789cc152c1 SHA256 fb929fd0e3658bc614f2ba51b9fba748050dbc76c0f1c0ac1bc233559bd2b4e7 +AUX mrtg.rc 1388 RMD160 beb973376ed5f5f1022fdc3caa1fdc5393c18a4a SHA1 11f32fbcc911ae3200eed8a41184cea6e94f93cb SHA256 25aa80a6eac6b7ca09a577c1ff895d40a03c167892aa1f2dde39a5085b24c41a +DIST mrtg-2.16.4.tar.gz 1089068 RMD160 9d7f2573fded09b16cd5b108271b9dd68d78bc18 SHA1 8d810487585c929bf48246311512f88077e10e55 SHA256 6d61fad616f6a73b2080a6ed295ec8d2a021a4e1110db42a2d35b9ad6d3037e6 +EBUILD mrtg-2.16.4.ebuild 1044 RMD160 4ff0f85e3ff5dcd3baddfddf64894244f9dbb0db SHA1 00194c3cff0aad36e790c0fd32ec2b6ac7355ae7 SHA256 6fc5482a5a87a13196579ef5ebe052d549cf3b397e5b5f85a496a2b6a7985534 +MISC metadata.xml 221 RMD160 6a612dbdb85b7cbc15a4f4924fc62b435900bee4 SHA1 59ce39c64900516f7d583951daacb16fc01f0ea1 SHA256 80bafe9d61de4580c061d796ca9c244633349b7a6da85aeae6e11bbaad597110
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-analyzer/mrtg/files/mrtg.confd Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,17 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $ + +MRTG_CONF="/etc/mrtg.conf" +MRTG_PID="/var/run/mrtg.pid" + +# uncomment and set the following, if you'd like to run mrtg as a +# different user/group +#MRTG_USER="" +#MRTG_GROUP="" + +# uncomment if you'd like to enable logging +#MRTG_LOG="/var/log/mrtg.log" + +# set any extra options here +MRTG_OPTS=""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-analyzer/mrtg/files/mrtg.rc Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,54 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.7 2007/04/19 19:08:08 cedk Exp $ + +depend() { + need net + + # if monitoring snmp variables on this machine: + # use net-snmpd +} + +checkconfig() { + if [[ ! -f ${MRTG_CONF} ]] ; then + eerror "Please create ${MRTG_CONF} (try man cfgmaker)" + return 1 + fi + + mrtg --check ${MRTG_CONF} + return $? +} + +start() { + # mrtg will not run if LANG=*utf8 + # use grep instead of bash regexp for bug #159786 + [[ "$(echo $LANG|grep -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$')" ]] \ + && LANG='C' + + checkconfig || return $? + + # enable logging? + [[ -n "${MRTG_LOG}" ]] && \ + MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}" + + # run as a different user? + [[ -n "${MRTG_USER}" ]] && \ + MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}" + + # run as a different group? + [[ -n "${MRTG_GROUP}" ]] && \ + MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}" + + ebegin "Starting mrtg" + start-stop-daemon --start --quiet --pidfile ${MRTG_PID} --name mrtg\ + --exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \ + ${MRTG_OPTS} ${MRTG_CONF} >/dev/null + eend $? "Failed to start mrtg" +} + +stop() { + ebegin "Stopping mrtg" + start-stop-daemon --stop --quiet --pidfile ${MRTG_PID} + eend $? "Failed to stop mrtg" +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-analyzer/mrtg/metadata.xml Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>netmon</herd> +<maintainer> + <email>netmon@gentoo.org</email> +</maintainer> +</pkgmetadata>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-analyzer/mrtg/mrtg-2.16.4.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,38 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.16.2-r1.ebuild,v 1.1 2010/05/29 04:48:18 pva Exp $ + +EAPI="3" + +DESCRIPTION="A tool to monitor the traffic load on network-links" +HOMEPAGE="http://oss.oetiker.ch/mrtg/" +SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" +IUSE="" + +DEPEND="dev-lang/perl + dev-perl/SNMP_Session + >=media-libs/gd-1.8.4" + +src_prepare() { + rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die +} + +src_install () { + keepdir /var/lib/mrtg + + emake DESTDIR="${ED}" install || die "emake install failed" + mv "${ED}/usr/share/doc/"{mrtg2,${PF}} + + newinitd "${FILESDIR}/mrtg.rc" ${PN} || die + newconfd "${FILESDIR}/mrtg.confd" ${PN} || die +} + +pkg_postinst(){ + elog "You must configure mrtg before being able to run it. Try cfgmaker." + elog "The following thread may be useful:" + elog "http://forums.gentoo.org/viewtopic-t-105862.html" +}
--- a/net-misc/rabbitmq-server/Manifest Wed Aug 04 13:44:58 2010 +0200 +++ b/net-misc/rabbitmq-server/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -1,3 +1,3 @@ AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c -DIST rabbitmq-server-1.7.2.tar.gz 156201 RMD160 ba2db97f88a3b51c6246307244e3f5b40112bb36 SHA1 ecc35617cc14cca7752f67b845bcc97e421254b4 SHA256 7a3f1a0324dbd1b450c85907fb43e92739f5c9708cf8550ef960a6eea9f488dd -EBUILD rabbitmq-server-1.7.2.ebuild 1835 RMD160 c9cf9a9e17384ca7fd6813020e34a2ea87026aee SHA1 1e47e69b5a5f7d41469af1458ec733b05326c751 SHA256 3287ea3483e1eca2763798d0d6ec8204acc39170d6f8770e6c1c3ff5e1d20638 +DIST rabbitmq-server-1.8.1.tar.gz 203726 RMD160 433cd232c14c1e8dc66e2359da55dd665a9b1ea2 SHA1 f8a803eb7a5fa78074d47196ed920bf1edcfb240 SHA256 6e85b9ade3e8f25fef5a390f6aad8e4395dd74cdfd16eecf80188b184bf65ab7 +EBUILD rabbitmq-server-1.8.1.ebuild 1585 RMD160 79e92961b57ad22563e1bbbd1a83948d33e52c6b SHA1 4d9b2306b2203fdd84b6baf15f8f8d23e9209591 SHA256 7723eb784051ef102a34df320f89f8dbadcfcdd848d5a60e1d92e3dae820a946
--- a/net-misc/rabbitmq-server/rabbitmq-server-1.7.2.ebuild Wed Aug 04 13:44:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.5.4-r2.ebuild,v 1.1 2009/06/21 15:45:19 caleb Exp $ - -inherit eutils - -DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang." -HOMEPAGE="http://www.rabbitmq.com/" -SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz" -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# Q: is RDEPEND-only sufficient for a binary package, since we don't compile? -DEPEND="dev-lang/erlang - dev-python/simplejson" -RDEPEND="${DEPEND}" - -src_install() { - # erlang module - local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}" - - einfo "Correcting additional Erlang code path in scripts" - sed -i -e "s:\`dirname \$0\`/rabbitmq-env:/usr/sbin/rabbitmq-env:g" scripts/* || die "sed failed" - - einfo "Installing Erlang module to ${targetdir}" - dodir "${targetdir}" - cp -dpR ebin include "${D}/${targetdir}" - - einfo "Installing server scripts to /usr/sbin" - # Install server scripts to sbin - dosbin scripts/rabbitmq-env scripts/rabbitmq-multi scripts/rabbitmq-server \ - scripts/rabbitmq-server scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins - - einfo "Installing rabbitmqctl to /usr/bin" - # Install control script to bin - dobin scripts/rabbitmqctl - - # Docs - dodoc README - - # create the directory where our log file will go. - diropts -m 0770 -o rabbitmq -g rabbitmq - keepdir /var/log/rabbitmq - - # create the mnesia directory - diropts -m 0770 -o rabbitmq -g rabbitmq - dodir /var/lib/rabbitmq/mnesia - - # Install the init script - newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq -} - -pkg_setup() { - enewgroup rabbitmq - enewuser rabbitmq -1 -1 -1 rabbitmq -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/rabbitmq-server-1.8.1.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,58 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-1.8.0.ebuild,v 1.1 2010/07/03 08:21:06 hollow Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang." +HOMEPAGE="http://www.rabbitmq.com/" +SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-lang/erlang" +DEPEND="${RDEPEND} + dev-libs/libxslt + dev-python/simplejson +" + +pkg_setup() { + enewgroup rabbitmq + enewuser rabbitmq -1 -1 -1 rabbitmq +} + +src_install() { + # erlang module + local targetdir="/usr/$(get_libdir)/erlang/lib/${P}" + + einfo "Setting correct RABBITMQ_HOME in scripts" + sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \ + -i scripts/rabbitmq_env + + einfo "Installing Erlang module to ${targetdir}" + insinto "${targetdir}" + doins -r ebin include + + einfo "Installing server scripts to /usr/sbin" + dosbin scripts/rabbitmq-multi scripts/rabbitmq-server scripts/rabbitmq-env \ + scripts/rabbitmq-activate-plugins scripts/rabbitmq-deactivate-plugins \ + scripts/rabbitmqctl + + # create the directory where our log file will go. + diropts -m 0770 -o rabbitmq -g rabbitmq + keepdir /var/log/rabbitmq + + # create the mnesia directory + diropts -m 0770 -o rabbitmq -g rabbitmq + dodir /var/lib/rabbitmq/mnesia + + # Install the init script + newinitd "${FILESDIR}"/rabbitmq-server.init rabbitmq + + dodoc README +}
--- a/net-proxy/squid/Manifest Wed Aug 04 13:44:58 2010 +0200 +++ b/net-proxy/squid/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -1,11 +1,14 @@ -AUX squid-3.1.1-gentoo.patch 12340 RMD160 2af977a632d7171e44783cb9d3916acbcbd5cf67 SHA1 a7af51e9dcc13be9447b4d5e2015b8ac6951fc6d SHA256 2306185beba98cc08e2b91edfef4227243c823038f06d4e6bfb90a601649c5c2 -AUX squid-3.1.1-libmd5.patch 600 RMD160 9f2891d87ae97188dc0423ad43449894b068b8ed SHA1 e61a8192f9d3085e7409e4059e4b2444cebf9b36 SHA256 e04ee68b9efea75d4fcd93a9f367c8973ca71308b003d66406cd582eacc0fba8 -AUX squid-3.1.1-qafixes.patch 3074 RMD160 a81372ceb4e55ebac7955ea13aa3e71a0a14b70f SHA1 2bd6f752d00d4bf1942c8f4e9304a60cb709e0d3 SHA256 c6f58b3a117e4901eeaed0571bb245876c658a816602a87036e77bd2793abcfc +AUX squid-3.1.5-errorstate-leak-fix.patch 550 RMD160 744f601d60e688a3cea3225d97e40fa729ff31cf SHA1 30778922c3298c8ffd85dd330b4d3a2d704ac38b SHA256 7ba2ad09069ef5094f81b0f90498cfcba079611e28d64a2759a4586781ab112a +AUX squid-3.1.5-gentoo.patch 12352 RMD160 a1c948634e8dc44329a8765db0af47eefd9ed3c5 SHA1 6472faaadb7b43d577ce0349dd441b2a9a5b3d04 SHA256 0ad4e1e572561370728dab5e4e3733fa64ed9728000668b9e6fff1af6cb4cee9 +AUX squid-3.1.5-libmd5.patch 588 RMD160 8ae39b18976cfa9fa3512262e002ef7e8543c61e SHA1 6447f81ca6cdd85f2a9c0e76bb48d6e0eac9ed80 SHA256 a2380cff52f649dea0f37091deb5f714b9cc912e295351bd4e49f46c13110209 +AUX squid-3.1.5-qafixes.patch 3074 RMD160 91024dd4a450bf0180cc691ce9e1d2a427c37a0c SHA1 acb65b63b969707d0ce1d29c3a6a77dc56b4fcdf SHA256 8542a6bebeb431ec4f0ceef4114d048f3201e10a4f68d6df81f0720d10690b13 +AUX squid-3.1.5-range-leak-fix-1.patch 1542 RMD160 2cda5c77b99a28f54e02a699a64cf9646c6b9083 SHA1 81051e9032853b4d567e716502385fc3c9bfbc9c SHA256 f7707eefd886e2e5b665424bed9b70b75ef2afe77236745661d18dd6e360d167 +AUX squid-3.1.5-range-leak-fix-2.patch 793 RMD160 ed284b09329943acb24c83725bb5d9fe15cb817a SHA1 d2be8ea0b3fa5a41c86d030c011172fcd1bb2c85 SHA256 83854638092ece023d3eccc39e2c739a66e55a471e1312a49fb4b8a5983a8823 AUX squid.confd 540 RMD160 aa4ec5a6eebad1222667aff6b3180931cf566b13 SHA1 1c0c23b08bd0450eae14604c2b45ca67c7ac25c5 SHA256 aeef7060c50074b65c664fc106d7319ce380d25320ee2ee00f7d6021846b88ec AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f AUX squid.initd 3315 RMD160 a6209a27770eb2aebdd533c946e790efec0de53b SHA1 08519fa20a7286cba9ea82e7b23dd8116ab7f77b SHA256 d3eac36c2fc313688e19cde7ace63783cd202315b23c0b2bd0219a4504cb2b35 AUX squid.initd-logrotate 3163 RMD160 b7d58517e4198ceb7416c00004c91ac30a241bfb SHA1 714d51e0c449817c12e7230942f89c1a62012107 SHA256 b403b7ffebc08c2ce76cd2b8b6c53a639f24e3e35933ba9766aa4623a34a1279 AUX squid.logrotate 103 RMD160 e7e4a6bde48e2735632692a6e628955b270f30ad SHA1 6e8d42f6a1a3109f0a26ed30edc7d91c6816e23f SHA256 e5ddce1c9af851040affa15e1a59e89d8db0f2eea7c461320a1d3784578f4482 AUX squid.pam 315 RMD160 afb3f1cc36ba5ef0015c40040b6d5c18485ec828 SHA1 40933fabaaa2a9cb38d57c3acb77857082c82ae5 SHA256 68ef4282f9fb8506df710d0ae16e84e991e9b138c7f1d0af922682219c7a971f -DIST squid-3.1.1.tar.gz 3251799 RMD160 3bd04da782a5c4bbee926a058c86c521dfb88502 SHA1 98a6f6ce4f4693793a50be5d1c40b74c42b6eb49 SHA256 310e41f4be17437a7fd8b5bf877f0cd2ff5c7a57706e55860364ffcfcf16692b -EBUILD squid-3.1.1.ebuild 6817 RMD160 eafec9696634d99bcdc5c1765ba00fdd1504c590 SHA1 277f56f7680220323e98ab2def30dc8a07ad627a SHA256 9578cfa1ce43fe141f3273abcc5d8beaf2871734f2514da8b203ce76da90c680 +DIST squid-3.1.5.tar.gz 3226676 RMD160 b5153ae6cbce267e62537bcaa1694091b142c727 SHA1 94eaa4a1aa7483af64ca04b1715204cfb4a01ee8 SHA256 93e0e5e3a8fc7ac991d34b69bbfbb7c48540df44b1a606a89304d1742c8d1bf7 +EBUILD squid-3.1.5.ebuild 6848 RMD160 af8daf348caa6d618fcaa9368abcbf1af00eafea SHA1 3a0ba070d66d0f50b028d900befc032b3e52decc SHA256 754f2a22bde73a836ce20d45b0c6deea4b752580c6252f9594320b549f3935c6
--- a/net-proxy/squid/files/squid-3.1.1-gentoo.patch Wed Aug 04 13:44:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,281 +0,0 @@ -diff -Nru squid-3.1.1.orig/acinclude.m4 squid-3.1.1/acinclude.m4 ---- squid-3.1.1.orig/acinclude.m4 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/acinclude.m4 2010-04-15 16:28:17.000000000 +0300 -@@ -75,7 +75,7 @@ - AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) - AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ - ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc --${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null -+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null - res=$? - rm -f conftest.* - echo yes -diff -Nru squid-3.1.1.orig/configure.in squid-3.1.1/configure.in ---- squid-3.1.1.orig/configure.in 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/configure.in 2010-04-15 16:28:49.000000000 +0300 -@@ -16,9 +16,9 @@ - PRESET_LDFLAGS="$LDFLAGS" - - dnl Set default LDFLAGS --if test -z "$LDFLAGS"; then -- LDFLAGS="-g" --fi -+dnl if test -z "$LDFLAGS"; then -+dnl LDFLAGS="-g" -+dnl fi - - dnl Check for GNU cc - AC_PROG_CC -diff -Nru squid-3.1.1.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.1/helpers/basic_auth/MSNT/confload.c ---- squid-3.1.1.orig/helpers/basic_auth/MSNT/confload.c 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/basic_auth/MSNT/confload.c 2010-04-15 16:29:51.000000000 +0300 -@@ -27,7 +27,7 @@ - - /* Path to configuration file */ - #ifndef SYSCONFDIR --#define SYSCONFDIR "/usr/local/squid/etc" -+#define SYSCONFDIR "/etc/squid" - #endif - #define CONFIGFILE SYSCONFDIR "/msntauth.conf" - -diff -Nru squid-3.1.1.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.1/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-3.1.1.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/basic_auth/MSNT/msntauth.conf.default 2010-04-15 16:30:39.000000000 +0300 -@@ -8,6 +8,6 @@ - server other_PDC other_BDC otherdomain - - # Denied and allowed users. Comment these if not needed. --#denyusers /usr/local/squid/etc/msntauth.denyusers --#allowusers /usr/local/squid/etc/msntauth.allowusers -+#denyusers /etc/squid/msntauth.denyusers -+#allowusers /etc/squid/msntauth.allowusers - -diff -Nru squid-3.1.1.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.1/helpers/basic_auth/SMB/Makefile.am ---- squid-3.1.1.orig/helpers/basic_auth/SMB/Makefile.am 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/basic_auth/SMB/Makefile.am 2010-04-15 16:31:23.000000000 +0300 -@@ -16,7 +16,7 @@ - ## FIXME: autoconf should test for the samba path. - - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX=/usr/local/samba -+SAMBAPREFIX=/usr - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - - libexec_SCRIPTS = $(SMB_AUTH_HELPER) -diff -Nru squid-3.1.1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.1/helpers/basic_auth/SMB/smb_auth.sh ---- squid-3.1.1.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/basic_auth/SMB/smb_auth.sh 2010-04-15 16:32:48.000000000 +0300 -@@ -24,7 +24,7 @@ - read AUTHSHARE - read AUTHFILE - read SMBUSER --read SMBPASS -+read -r SMBPASS - - # Find domain controller - echo "Domain name: $DOMAINNAME" -@@ -47,7 +47,7 @@ - addropt="" - fi - echo "Query address options: $addropt" --dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` -+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` - echo "Domain controller IP address: $dcip" - [ -n "$dcip" ] || exit 1 - -diff -Nru squid-3.1.1.orig/helpers/external_acl/session/squid_session.8 squid-3.1.1/helpers/external_acl/session/squid_session.8 ---- squid-3.1.1.orig/helpers/external_acl/session/squid_session.8 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/external_acl/session/squid_session.8 2010-04-15 16:33:36.000000000 +0300 -@@ -35,7 +35,7 @@ - .P - Configuration example using the default automatic mode - .IP --external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session -+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session - .IP - acl session external session - .IP -diff -Nru squid-3.1.1.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.1/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-3.1.1.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/external_acl/unix_group/squid_unix_group.8 2010-04-15 16:34:17.000000000 +0300 -@@ -27,7 +27,7 @@ - This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 - matches users in group2 or group3 - .IP --external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p -+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p - .IP - acl usergroup1 external unix_group group1 - .IP -diff -Nru squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in ---- squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-04-15 17:35:20.000000000 +0300 -@@ -17,6 +17,7 @@ - - AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com]) - AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5) -+AM_MAINTAINER_MODE - AC_CONFIG_SRCDIR([squid_kerb_auth.c]) - - AC_PROG_CC -@@ -467,7 +468,7 @@ - echo "configure: ##" - echo "configure: ## -----------------------------##" - --MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" -+MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" - for ac_cv_my_cflag in $MY_CFLAGS; do - echo "int main() - { -diff -Nru squid-3.1.1.orig/lib/libTrie/acinclude.m4 squid-3.1.1/lib/libTrie/acinclude.m4 ---- squid-3.1.1.orig/lib/libTrie/acinclude.m4 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/lib/libTrie/acinclude.m4 2010-04-15 17:35:48.000000000 +0300 -@@ -11,7 +11,7 @@ - AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) - AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ - ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc --${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null -+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null - res=$? - rm -f conftest.* - echo yes -diff -Nru squid-3.1.1.orig/lib/libTrie/configure.in squid-3.1.1/lib/libTrie/configure.in ---- squid-3.1.1.orig/lib/libTrie/configure.in 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/lib/libTrie/configure.in 2010-04-15 17:36:46.000000000 +0300 -@@ -59,8 +59,8 @@ - - dnl set useful flags - if test "$GCC" = "yes"; then -- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" -- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments" -+ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations" -+ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings" - else - TRIE_CFLAGS= - TRIE_CXXFLAGS= -diff -Nru squid-3.1.1.orig/src/Makefile.am squid-3.1.1/src/Makefile.am ---- squid-3.1.1.orig/src/Makefile.am 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/src/Makefile.am 2010-04-15 17:44:39.000000000 +0300 -@@ -638,7 +638,6 @@ - - sysconf_DATA = \ - squid.conf.default \ -- squid.conf.documented \ - mime.conf.default - - data_DATA = \ -@@ -718,8 +717,8 @@ - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log - DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) --DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` -@@ -797,13 +796,11 @@ - @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ - echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ - else \ -- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ -+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ -+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ - fi -- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ -- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ -- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \ -- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ -+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ -+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) - - uninstall-local: squid.conf.default -diff -Nru squid-3.1.1.orig/src/cf.data.pre squid-3.1.1/src/cf.data.pre ---- squid-3.1.1.orig/src/cf.data.pre 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/src/cf.data.pre 2010-04-15 17:39:56.000000000 +0300 -@@ -718,6 +718,7 @@ - acl Safe_ports port 488 # gss-http - acl Safe_ports port 591 # filemaker - acl Safe_ports port 777 # multiling http -+acl Safe_ports port 901 # SWAT - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -867,6 +868,9 @@ - http_access allow localnet - http_access allow localhost - -+# Allow the localhost to have access by default -+http_access allow localhost -+ - # And finally deny all other access to this proxy - http_access deny all - NOCOMMENT_END -@@ -4037,11 +4041,11 @@ - - NAME: cache_mgr - TYPE: string --DEFAULT: webmaster -+DEFAULT: root - LOC: Config.adminEmail - DOC_START - Email-address of local cache manager who will receive -- mail if the cache dies. The default is "webmaster." -+ mail if the cache dies. The default is "root". - DOC_END - - NAME: mail_from -@@ -6353,7 +6357,7 @@ - NAME: forwarded_for - COMMENT: on|off|transparent|truncate|delete - TYPE: string --DEFAULT: on -+DEFAULT: delete - LOC: opt_forwarded_for - DOC_START - If set to "on", Squid will append your client's IP address -diff -Nru squid-3.1.1.orig/src/debug.cc squid-3.1.1/src/debug.cc ---- squid-3.1.1.orig/src/debug.cc 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/src/debug.cc 2010-04-15 17:40:27.000000000 +0300 -@@ -452,7 +452,7 @@ - #if HAVE_SYSLOG && defined(LOG_LOCAL4) - - if (Debug::log_syslog) -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); - - #endif /* HAVE_SYSLOG */ - -diff -Nru squid-3.1.1.orig/src/main.cc squid-3.1.1/src/main.cc ---- squid-3.1.1.orig/src/main.cc 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/src/main.cc 2010-04-15 17:41:34.000000000 +0300 -@@ -1535,7 +1535,7 @@ - if (*(argv[0]) == '(') - return; - -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); - - if ((pid = fork()) < 0) - syslog(LOG_ALERT, "fork failed: %s", xstrerror()); -@@ -1579,7 +1579,7 @@ - - if ((pid = fork()) == 0) { - /* child */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); - prog = xstrdup(argv[0]); - argv[0] = xstrdup("(squid)"); - execvp(prog, argv); -@@ -1587,7 +1587,7 @@ - } - - /* parent */ -- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); -+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); - - syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); -
--- a/net-proxy/squid/files/squid-3.1.1-libmd5.patch Wed Aug 04 13:44:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -diff -Nru squid-3.1.0.15.orig/configure.in squid-3.1.0.15/configure.in ---- squid-3.1.0.15.orig/configure.in 2009-11-23 04:11:00.000000000 +0100 -+++ squid-3.1.0.15/configure.in 2009-11-29 09:44:37.000000000 +0100 -@@ -2802,7 +2802,11 @@ - dnl libcrypt (eg FreeBSD) - AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"]) - dnl Solaris10 provides MD5 natively through libmd5 --AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) -+case "$host" in -+ *-solaris*) -+ AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) -+ ;; -+esac - AC_SUBST(CRYPTLIB) - - dnl Check for libdl, used by auth_modules/PAM
--- a/net-proxy/squid/files/squid-3.1.1-qafixes.patch Wed Aug 04 13:44:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -diff -Nru squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in ---- squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-04-15 18:08:18.000000000 +0300 -@@ -93,7 +94,7 @@ - else - ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` - if test "x$ac_gssapi_libs" != "x" ; then -- LDFLAGS="$LDFLAGS $ac_gssapi_libs" -+ LIBS="$LIBS $ac_gssapi_libs" - else - for lib in $ac_gss_libs; do - AC_CHECK_LIB($lib,main) -@@ -117,7 +118,7 @@ - fi - ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` - if test "x$ac_gssapi_libs" != "x" ; then -- LDFLAGS="$LDFLAGS $ac_gssapi_libs" -+ LIBS="$LIBS $ac_gssapi_libs" - else - for lib in $ac_gss_libs; do - AC_CHECK_LIB($lib,main) -@@ -171,7 +172,7 @@ - ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` - LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" - fi -- LDFLAGS="$LDFLAGS $ac_gssapi_libs" -+ LIBS="$LIBS $ac_gssapi_libs" - else - for lib in $ac_gss_libs; do - AC_CHECK_LIB($lib,main) -@@ -200,7 +201,7 @@ - ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` - LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" - fi -- LDFLAGS="$LDFLAGS $ac_gssapi_libs" -+ LIBS="$LIBS $ac_gssapi_libs" - else - for lib in $ac_gss_libs; do - AC_CHECK_LIB($lib,main) -diff -Nru squid-3.1.1.orig/src/forward.cc squid-3.1.1/src/forward.cc ---- squid-3.1.1.orig/src/forward.cc 2010-04-15 16:27:19.000000000 +0300 -+++ squid-3.1.1/src/forward.cc 2010-04-15 18:19:20.000000000 +0300 -@@ -999,8 +999,12 @@ - break; - - if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) { -- int *tmp = (int*)CMSG_DATA(o); -- clientFde->upstreamTOS = (unsigned char)*tmp; -+ union { -+ unsigned char *pchar; -+ int *pint; -+ } data; -+ data.pchar = CMSG_DATA(o); -+ clientFde->upstreamTOS = (unsigned char)*data.pint; - break; - } - pbuf += CMSG_LEN(o->cmsg_len);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.5-errorstate-leak-fix.patch Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,14 @@ +--- src/forward.cc 2010-05-04 23:06:00 +0000 ++++ src/forward.cc 2010-05-27 00:09:40 +0000 +@@ -527,7 +527,10 @@ + + /* Ditch error page if it was created before. + * A new one will be created if there's another problem */ +- err = NULL; ++ if (err) { ++ errorStateFree(err); ++ err = NULL; ++ } + + /* use eventAdd to break potential call sequence loops and to slow things down a little */ + eventAdd("fwdConnectStart", fwdConnectStartWrapper, this, originserver ? 0.05 : 0.005, 0);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.5-gentoo.patch Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,281 @@ +diff -ruN squid-3.1.4.orig/acinclude.m4 squid-3.1.4/acinclude.m4 +--- squid-3.1.4.orig/acinclude.m4 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/acinclude.m4 2010-06-15 23:56:30.328286612 +0200 +@@ -75,7 +75,7 @@ + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ + ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc +-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null ++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null + res=$? + rm -f conftest.* + echo yes +diff -ruN squid-3.1.4.orig/configure.in squid-3.1.4/configure.in +--- squid-3.1.4.orig/configure.in 2010-05-30 15:21:49.000000000 +0200 ++++ squid-3.1.4/configure.in 2010-06-15 23:56:30.331286981 +0200 +@@ -16,9 +16,9 @@ + PRESET_LDFLAGS="$LDFLAGS" + + dnl Set default LDFLAGS +-if test -z "$LDFLAGS"; then +- LDFLAGS="-g" +-fi ++dnl if test -z "$LDFLAGS"; then ++dnl LDFLAGS="-g" ++dnl fi + + dnl Check for GNU cc + AC_PROG_CC +diff -ruN squid-3.1.4.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.4/helpers/basic_auth/MSNT/confload.c +--- squid-3.1.4.orig/helpers/basic_auth/MSNT/confload.c 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/basic_auth/MSNT/confload.c 2010-06-15 23:56:30.332287748 +0200 +@@ -27,7 +27,7 @@ + + /* Path to configuration file */ + #ifndef SYSCONFDIR +-#define SYSCONFDIR "/usr/local/squid/etc" ++#define SYSCONFDIR "/etc/squid" + #endif + #define CONFIGFILE SYSCONFDIR "/msntauth.conf" + +diff -ruN squid-3.1.4.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.4/helpers/basic_auth/MSNT/msntauth.conf.default +--- squid-3.1.4.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/basic_auth/MSNT/msntauth.conf.default 2010-06-15 23:56:30.333286558 +0200 +@@ -8,6 +8,6 @@ + server other_PDC other_BDC otherdomain + + # Denied and allowed users. Comment these if not needed. +-#denyusers /usr/local/squid/etc/msntauth.denyusers +-#allowusers /usr/local/squid/etc/msntauth.allowusers ++#denyusers /etc/squid/msntauth.denyusers ++#allowusers /etc/squid/msntauth.allowusers + +diff -ruN squid-3.1.4.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.4/helpers/basic_auth/SMB/Makefile.am +--- squid-3.1.4.orig/helpers/basic_auth/SMB/Makefile.am 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/basic_auth/SMB/Makefile.am 2010-06-15 23:56:30.333286558 +0200 +@@ -16,7 +16,7 @@ + ## FIXME: autoconf should test for the samba path. + + SMB_AUTH_HELPER = smb_auth.sh +-SAMBAPREFIX=/usr/local/samba ++SAMBAPREFIX=/usr + SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + + libexec_SCRIPTS = $(SMB_AUTH_HELPER) +diff -ruN squid-3.1.4.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.4/helpers/basic_auth/SMB/smb_auth.sh +--- squid-3.1.4.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/basic_auth/SMB/smb_auth.sh 2010-06-15 23:56:30.334286833 +0200 +@@ -24,7 +24,7 @@ + read AUTHSHARE + read AUTHFILE + read SMBUSER +-read SMBPASS ++read -r SMBPASS + + # Find domain controller + echo "Domain name: $DOMAINNAME" +@@ -47,7 +47,7 @@ + addropt="" + fi + echo "Query address options: $addropt" +-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` ++dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` + echo "Domain controller IP address: $dcip" + [ -n "$dcip" ] || exit 1 + +diff -ruN squid-3.1.4.orig/helpers/external_acl/session/squid_session.8 squid-3.1.4/helpers/external_acl/session/squid_session.8 +--- squid-3.1.4.orig/helpers/external_acl/session/squid_session.8 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/external_acl/session/squid_session.8 2010-06-15 23:56:30.334286833 +0200 +@@ -35,7 +35,7 @@ + .P + Configuration example using the default automatic mode + .IP +-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session ++external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session + .IP + acl session external session + .IP +diff -ruN squid-3.1.4.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.4/helpers/external_acl/unix_group/squid_unix_group.8 +--- squid-3.1.4.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-05-30 15:21:12.000000000 +0200 ++++ squid-3.1.4/helpers/external_acl/unix_group/squid_unix_group.8 2010-06-15 23:56:30.335286619 +0200 +@@ -27,7 +27,7 @@ + This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 + matches users in group2 or group3 + .IP +-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p ++external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p + .IP + acl usergroup1 external unix_group group1 + .IP +diff -ruN squid-3.1.4.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in +--- squid-3.1.4.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-06-15 23:56:30.335286619 +0200 +@@ -17,6 +17,7 @@ + + AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com]) + AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5) ++AM_MAINTAINER_MODE + AC_CONFIG_SRCDIR([squid_kerb_auth.c]) + + AC_PROG_CC +@@ -467,7 +468,7 @@ + echo "configure: ##" + echo "configure: ## -----------------------------##" + +-MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" ++MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" + for ac_cv_my_cflag in $MY_CFLAGS; do + echo "int main() + { +diff -ruN squid-3.1.4.orig/lib/libTrie/acinclude.m4 squid-3.1.4/lib/libTrie/acinclude.m4 +--- squid-3.1.4.orig/lib/libTrie/acinclude.m4 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/lib/libTrie/acinclude.m4 2010-06-15 23:56:30.336287383 +0200 +@@ -11,7 +11,7 @@ + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ + ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc +-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null ++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null + res=$? + rm -f conftest.* + echo yes +diff -ruN squid-3.1.4.orig/lib/libTrie/configure.in squid-3.1.4/lib/libTrie/configure.in +--- squid-3.1.4.orig/lib/libTrie/configure.in 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/lib/libTrie/configure.in 2010-06-15 23:56:30.336287383 +0200 +@@ -59,8 +59,8 @@ + + dnl set useful flags + if test "$GCC" = "yes"; then +- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" +- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments" ++ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations" ++ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings" + else + TRIE_CFLAGS= + TRIE_CXXFLAGS= +diff -ruN squid-3.1.4.orig/src/cf.data.pre squid-3.1.4/src/cf.data.pre +--- squid-3.1.4.orig/src/cf.data.pre 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/src/cf.data.pre 2010-06-15 23:56:30.344287666 +0200 +@@ -718,6 +718,7 @@ + acl Safe_ports port 488 # gss-http + acl Safe_ports port 591 # filemaker + acl Safe_ports port 777 # multiling http ++acl Safe_ports port 901 # SWAT + acl CONNECT method CONNECT + NOCOMMENT_END + DOC_END +@@ -866,6 +867,9 @@ + http_access allow localnet + http_access allow localhost + ++# Allow the localhost to have access by default ++http_access allow localhost ++ + # And finally deny all other access to this proxy + http_access deny all + NOCOMMENT_END +@@ -4036,11 +4040,11 @@ + + NAME: cache_mgr + TYPE: string +-DEFAULT: webmaster ++DEFAULT: root + LOC: Config.adminEmail + DOC_START + Email-address of local cache manager who will receive +- mail if the cache dies. The default is "webmaster." ++ mail if the cache dies. The default is "root". + DOC_END + + NAME: mail_from +@@ -6352,7 +6356,7 @@ + NAME: forwarded_for + COMMENT: on|off|transparent|truncate|delete + TYPE: string +-DEFAULT: on ++DEFAULT: delete + LOC: opt_forwarded_for + DOC_START + If set to "on", Squid will append your client's IP address +diff -ruN squid-3.1.4.orig/src/debug.cc squid-3.1.4/src/debug.cc +--- squid-3.1.4.orig/src/debug.cc 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/src/debug.cc 2010-06-15 23:56:30.345286478 +0200 +@@ -452,7 +452,7 @@ + #if HAVE_SYSLOG && defined(LOG_LOCAL4) + + if (Debug::log_syslog) +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); + + #endif /* HAVE_SYSLOG */ + +diff -ruN squid-3.1.4.orig/src/main.cc squid-3.1.4/src/main.cc +--- squid-3.1.4.orig/src/main.cc 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/src/main.cc 2010-06-15 23:56:30.347286547 +0200 +@@ -1553,7 +1553,7 @@ + if (*(argv[0]) == '(') + return; + +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); + + if ((pid = fork()) < 0) + syslog(LOG_ALERT, "fork failed: %s", xstrerror()); +@@ -1597,7 +1597,7 @@ + + if ((pid = fork()) == 0) { + /* child */ +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); + prog = xstrdup(argv[0]); + argv[0] = xstrdup("(squid)"); + execvp(prog, argv); +@@ -1605,7 +1605,7 @@ + } + + /* parent */ +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); + + syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); + +diff -ruN squid-3.1.4.orig/src/Makefile.am squid-3.1.4/src/Makefile.am +--- squid-3.1.4.orig/src/Makefile.am 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/src/Makefile.am 2010-06-15 23:56:30.338286964 +0200 +@@ -638,7 +638,6 @@ + + sysconf_DATA = \ + squid.conf.default \ +- squid.conf.documented \ + mime.conf.default + + data_DATA = \ +@@ -718,8 +717,8 @@ + DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log + DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log + DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) +-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state +-DEFAULT_SWAP_DIR = $(localstatedir)/cache ++DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state ++DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` +@@ -797,13 +796,11 @@ + @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ + else \ +- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ +- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ ++ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ ++ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ + fi +- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ +- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ +- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \ +- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ ++ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ ++ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ + $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \ + $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)` +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.5-libmd5.patch Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,16 @@ +diff -ruN squid-3.1.4.orig/configure.in squid-3.1.4/configure.in +--- squid-3.1.4.orig/configure.in 2010-05-30 15:21:49.000000000 +0200 ++++ squid-3.1.4/configure.in 2010-06-15 23:53:35.180163134 +0200 +@@ -2814,7 +2814,11 @@ + dnl libcrypt (eg FreeBSD) + AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"]) + dnl Solaris10 provides MD5 natively through libmd5 +-AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) ++case "$host" in ++ *-solaris*) ++ AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) ++ ;; ++esac + AC_SUBST(CRYPTLIB) + + dnl Check for libdl, used by auth_modules/PAM
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.5-qafixes.patch Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,57 @@ +diff -ruN squid-3.1.4.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in +--- squid-3.1.4.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-06-16 00:02:04.241287315 +0200 ++++ squid-3.1.4/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-06-16 00:00:08.296162082 +0200 +@@ -94,7 +94,7 @@ + else + ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` + if test "x$ac_gssapi_libs" != "x" ; then +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -118,7 +118,7 @@ + fi + ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` + if test "x$ac_gssapi_libs" != "x" ; then +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -172,7 +172,7 @@ + ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` + LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" + fi +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -201,7 +201,7 @@ + ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` + LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" + fi +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +diff -ruN squid-3.1.4.orig/src/forward.cc squid-3.1.4/src/forward.cc +--- squid-3.1.4.orig/src/forward.cc 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/src/forward.cc 2010-06-16 00:00:08.297162834 +0200 +@@ -999,8 +999,12 @@ + break; + + if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) { +- int *tmp = (int*)CMSG_DATA(o); +- clientFde->upstreamTOS = (unsigned char)*tmp; ++ union { ++ unsigned char *pchar; ++ int *pint; ++ } data; ++ data.pchar = CMSG_DATA(o); ++ clientFde->upstreamTOS = (unsigned char)*data.pint; + break; + } + pbuf += CMSG_LEN(o->cmsg_len);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.5-range-leak-fix-1.patch Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,45 @@ +http://bugs.squid-cache.org/attachment.cgi?id=2166&action=diff + +Backported to squid-3.1.5 by Kerin Millar <kerframil@gmail.com> + +diff -urp squid-3.1.5.orig/src/HttpReply.cc squid-3.1.5/src/HttpReply.cc +--- squid-3.1.5.orig/src/HttpReply.cc 2010-07-15 00:40:43.562561668 +0400 ++++ squid-3.1.5/src/HttpReply.cc 2010-07-15 00:51:09.046799333 +0400 +@@ -607,6 +607,7 @@ HttpReply * + HttpReply::clone() const + { + HttpReply *rep = new HttpReply(); ++ rep->sline = sline; // used in hdrCacheInit() call above + rep->header.append(&header); + rep->hdrCacheInit(); + rep->hdr_sz = hdr_sz; +@@ -615,8 +616,7 @@ HttpReply::clone() const + rep->body_pipe = body_pipe; + + rep->protocol = protocol; +- rep->sline = sline; +- rep->keep_alive = keep_alive; ++ // keep_alive is handled in HttpMsg::hdrCacheInit() + return rep; + } + +diff -urp squid-3.1.5.orig/src/HttpRequest.cc squid-3.1.5/src/HttpRequest.cc +--- squid-3.1.5.orig/src/HttpRequest.cc 2010-07-02 06:47:30.000000000 +0400 ++++ squid-3.1.5/src/HttpRequest.cc 2010-07-15 00:45:21.755798990 +0400 +@@ -188,7 +188,7 @@ HttpRequest::clone() const + // urlPath handled in ctor + copy->canonical = canonical ? xstrdup(canonical) : NULL; + +- copy->range = range ? new HttpHdrRange(*range) : NULL; ++ // range handled in hdrCacheInit() + copy->ims = ims; + copy->imslen = imslen; + copy->max_forwards = max_forwards; +@@ -358,6 +358,7 @@ HttpRequest::hdrCacheInit() + { + HttpMsg::hdrCacheInit(); + ++ assert(!range); + range = header.getRange(); + } +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.5-range-leak-fix-2.patch Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,23 @@ +--- a/src/client_side_request.cc ++++ a/src/client_side_request.cc +@@ -830,6 +830,8 @@ clientInterpretRequestHeaders(ClientHttpRequest * http) + + /* ignore range header in non-GETs or non-HEADs */ + if (request->method == METHOD_GET || request->method == METHOD_HEAD) { ++ if (request->range) ++ delete request->range; + request->range = req_hdr->getRange(); + + if (request->range) { +@@ -854,7 +856,10 @@ clientInterpretRequestHeaders(ClientHttpRequest * http) + else { + req_hdr->delById(HDR_RANGE); + req_hdr->delById(HDR_REQUEST_RANGE); +- request->range = NULL; ++ if (request->range) { ++ delete request->range; ++ request->range = NULL; ++ } + } + + if (req_hdr->has(HDR_AUTHORIZATION))
--- a/net-proxy/squid/squid-3.1.1.ebuild Wed Aug 04 13:44:58 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,207 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.15_beta-r1.ebuild,v 1.1 2009/11/29 08:53:09 mrness Exp $ - -EAPI="2" - -inherit eutils pam toolchain-funcs - -DESCRIPTION="A full-featured web proxy cache" -HOMEPAGE="http://www.squid-cache.org/" -SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ - ecap icap-client \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux +epoll" -RESTRICT=test - -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - ecap? ( net-libs/libecap ) - selinux? ( sec-policy/selinux-squid ) - !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) - >=sys-libs/db-4 - dev-lang/perl" -DEPEND="${COMMON_DEPEND} - sys-devel/automake - sys-devel/autoconf - sys-devel/libtool - test? ( dev-util/cppunit )" -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -# S="${WORKDIR}/${P}" - -pkg_setup() { - if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then - eerror "coss store IO has been disabled by upstream due to stability issues!" - eerror "If you want to install this version, switch the store type to something else" - eerror "before attempting to install this version again." - - die "/etc/squid/squid.conf: cache_dir use a disabled store type" - fi - - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-qafixes.patch - epatch "${FILESDIR}"/${P}-libmd5.patch - - # eautoreconf breaks lib/libLtdl/libtool script - ./bootstrap.sh || die "autoreconf failed" -} - -src_configure() { - local myconf="" - - local basic_modules="getpwnam,NCSA,MSNT" - use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" - use ldap && basic_modules="LDAP,${basic_modules}" - use pam && basic_modules="PAM,${basic_modules}" - use sasl && basic_modules="SASL,${basic_modules}" - use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" - use radius && basic_modules="squid_radius_auth,${basic_modules}" - if use mysql || use postgres || use sqlite ; then - basic_modules="DB,${basic_modules}" - fi - - local digest_modules="password" - use ldap && digest_modules="ldap,${digest_modules}" - - local ext_helpers="ip_user,session,unix_group" - use samba && ext_helpers="wbinfo_group,${ext_helpers}" - use ldap && ext_helpers="ldap_group,${ext_helpers}" - - local ntlm_helpers="fakeauth" - use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" - - local negotiate_helpers= - if use kerberos; then - negotiate_helpers="squid_kerb_auth" - has_version app-crypt/mit-krb5 \ - && myconf="--enable-mit --disable-heimdal" \ - || myconf="--disable-mit --enable-heimdal" - fi - - # coss support has been disabled - # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) - myconf="${myconf} --enable-storeio=ufs,diskd,aufs" - - if use kernel_linux; then - myconf="${myconf} --enable-linux-netfilter - $(use_enable epoll)" - elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then - myconf="${myconf} $(use_enable kqueue)" - if use pf-transparent; then - myconf="${myconf} --enable-pf-transparent" - elif use ipf-transparent; then - myconf="${myconf} --enable-ipf-transparent" - fi - fi - - export CC=$(tc-getCC) - - econf \ - --sysconfdir=/etc/squid \ - --libexecdir=/usr/libexec/squid \ - --localstatedir=/var \ - --with-pidfile=/var/run/squid.pid \ - --datadir=/usr/share/squid \ - --with-logdir=/var/log/squid \ - --with-default-user=squid \ - --enable-auth="basic,digest,negotiate,ntlm" \ - --enable-removal-policies="lru,heap" \ - --enable-digest-auth-helpers="${digest_modules}" \ - --enable-basic-auth-helpers="${basic_modules}" \ - --enable-external-acl-helpers="${ext_helpers}" \ - --enable-ntlm-auth-helpers="${ntlm_helpers}" \ - --enable-negotiate-auth-helpers="${negotiate_helpers}" \ - --enable-useragent-log \ - --enable-cache-digests \ - --enable-delay-pools \ - --enable-referer-log \ - --enable-arp-acl \ - --with-large-files \ - --with-filedescriptors=8192 \ - --disable-strict-error-checking \ - $(use_enable caps) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - $(use_enable ecap) \ - $(use_enable zero-penalty-hit zph-qos) \ - ${myconf} || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # need suid root for looking into /etc/shadow - fowners root:squid /usr/libexec/squid/ncsa_auth - fowners root:squid /usr/libexec/squid/pam_auth - fperms 4750 /usr/libexec/squid/ncsa_auth - fperms 4750 /usr/libexec/squid/pam_auth - - # some cleanups - rm -f "${D}"/usr/bin/Run* - - dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ - helpers/ntlm_auth/no_check/README.no_check_ntlm_auth - newdoc helpers/basic_auth/SMB/README README.auth_smb - dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html - newdoc helpers/basic_auth/LDAP/README README.auth_ldap - doman helpers/basic_auth/LDAP/*.8 - dodoc helpers/basic_auth/SASL/squid_sasl_auth* - - newpamd "${FILESDIR}/squid.pam" squid - newconfd "${FILESDIR}/squid.confd" squid - if use logrotate; then - newinitd "${FILESDIR}/squid.initd-logrotate" squid - insinto /etc/logrotate.d - newins "${FILESDIR}/squid.logrotate" squid - else - newinitd "${FILESDIR}/squid.initd" squid - exeinto /etc/cron.weekly - newexe "${FILESDIR}/squid.cron" squid.cron - fi - - rm -rf "${D}"/var - diropts -m0755 -o squid -g squid - keepdir /var/cache/squid /var/log/squid -} - -pkg_postinst() { - echo - ewarn "Squid authentication helpers have been installed suid root." - ewarn "This allows shadow based authentication (see bug #52977 for more)." - echo - ewarn "Be careful what type of cache_dir you select!" - ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" - ewarn "when there isn't sufficient traffic to keep squid reasonably busy." - ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." - echo - ewarn "Squid can be configured to run in transparent mode like this:" - ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" - if use zero-penalty-hit; then - echo - ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" - ewarn "with the patch that can be found on http://zph.bratcheda.org site." - fi -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/squid-3.1.5.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,221 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" + +inherit base eutils pam toolchain-funcs + +DESCRIPTION="A full-featured web proxy cache" +HOMEPAGE="http://www.squid-cache.org/" +SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ + ecap icap-client \ + mysql postgres sqlite \ + zero-penalty-hit \ + pf-transparent ipf-transparent kqueue \ + elibc_uclibc kernel_linux +epoll" + +RESTRICT=test + +COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) + pam? ( virtual/pam ) + ldap? ( net-nds/openldap ) + kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) + ssl? ( dev-libs/openssl ) + sasl? ( dev-libs/cyrus-sasl ) + ecap? ( net-libs/libecap ) + selinux? ( sec-policy/selinux-squid ) + !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) + >=sys-libs/db-4 + dev-lang/perl" + +DEPEND="${COMMON_DEPEND} + sys-devel/automake + sys-devel/autoconf + sys-devel/libtool + test? ( dev-util/cppunit )" + +RDEPEND="${COMMON_DEPEND} + samba? ( net-fs/samba ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + sqlite? ( dev-perl/DBD-SQLite )" + +PATCHES=( + "${FILESDIR}/${P}-gentoo.patch" + "${FILESDIR}/${P}-qafixes.patch" + "${FILESDIR}/${P}-libmd5.patch" + "${FILESDIR}/${P}-errorstate-leak-fix.patch" + "${FILESDIR}/${P}-range-leak-fix-1.patch" + "${FILESDIR}/${P}-range-leak-fix-2.patch" +) + +pkg_pretend() { + if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then + eerror "coss store IO has been disabled by upstream due to stability issues!" + eerror "If you want to install this version, switch the store type to something else" + eerror "before attempting to install this version again." + + die "/etc/squid/squid.conf: cache_dir use a disabled store type" + fi +} + +pkg_setup() { + [ ${EAPI} -lt 4 ] && pkg_pretend + + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +src_prepare() { + base_src_prepare + + # eautoreconf breaks lib/libLtdl/libtool script + ./bootstrap.sh || die "autoreconf failed" +} + +src_configure() { + local myconf="" + + local basic_modules="getpwnam,NCSA,MSNT" + use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" + use ldap && basic_modules="LDAP,${basic_modules}" + use pam && basic_modules="PAM,${basic_modules}" + use sasl && basic_modules="SASL,${basic_modules}" + use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" + use radius && basic_modules="squid_radius_auth,${basic_modules}" + + if use mysql || use postgres || use sqlite ; then + basic_modules="DB,${basic_modules}" + fi + + local digest_modules="password" + use ldap && digest_modules="ldap,${digest_modules}" + + local ext_helpers="ip_user,session,unix_group" + use samba && ext_helpers="wbinfo_group,${ext_helpers}" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local ntlm_helpers="fakeauth" + use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" + + local negotiate_helpers= + if use kerberos; then + negotiate_helpers="squid_kerb_auth" + has_version app-crypt/mit-krb5 \ + && myconf="--enable-mit --disable-heimdal" \ + || myconf="--disable-mit --enable-heimdal" + fi + + # coss support has been disabled + # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) + myconf="${myconf} --enable-storeio=ufs,diskd,aufs" + + if use kernel_linux; then + myconf="${myconf} --enable-linux-netfilter + $(use_enable epoll)" + elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then + myconf="${myconf} $(use_enable kqueue)" + if use pf-transparent; then + myconf="${myconf} --enable-pf-transparent" + elif use ipf-transparent; then + myconf="${myconf} --enable-ipf-transparent" + fi + fi + + export CC=$(tc-getCC) + + econf \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/libexec/squid \ + --localstatedir=/var \ + --with-pidfile=/var/run/squid.pid \ + --datadir=/usr/share/squid \ + --with-logdir=/var/log/squid \ + --with-default-user=squid \ + --enable-auth="basic,digest,negotiate,ntlm" \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="${digest_modules}" \ + --enable-basic-auth-helpers="${basic_modules}" \ + --enable-external-acl-helpers="${ext_helpers}" \ + --enable-ntlm-auth-helpers="${ntlm_helpers}" \ + --enable-negotiate-auth-helpers="${negotiate_helpers}" \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-arp-acl \ + --with-large-files \ + --with-filedescriptors=8192 \ + --disable-strict-error-checking \ + $(use_enable caps) \ + $(use_enable ipv6) \ + $(use_enable snmp) \ + $(use_enable ssl) \ + $(use_enable icap-client) \ + $(use_enable ecap) \ + $(use_enable zero-penalty-hit zph-qos) \ + ${myconf} || die "econf failed" +} + +src_install() { + base_src_install + + # need suid root for looking into /etc/shadow + fowners root:squid /usr/libexec/squid/ncsa_auth + fowners root:squid /usr/libexec/squid/pam_auth + fperms 4750 /usr/libexec/squid/ncsa_auth + fperms 4750 /usr/libexec/squid/pam_auth + + # some cleanups + rm -f "${D}"/usr/bin/Run* + + dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ + helpers/ntlm_auth/no_check/README.no_check_ntlm_auth + newdoc helpers/basic_auth/SMB/README README.auth_smb + dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html + newdoc helpers/basic_auth/LDAP/README README.auth_ldap + doman helpers/basic_auth/LDAP/*.8 + dodoc helpers/basic_auth/SASL/squid_sasl_auth* + + newpamd "${FILESDIR}/squid.pam" squid + newconfd "${FILESDIR}/squid.confd" squid + + if use logrotate; then + newinitd "${FILESDIR}/squid.initd-logrotate" squid + insinto /etc/logrotate.d + newins "${FILESDIR}/squid.logrotate" squid + else + newinitd "${FILESDIR}/squid.initd" squid + exeinto /etc/cron.weekly + newexe "${FILESDIR}/squid.cron" squid.cron + fi + + rm -rf "${D}"/var + diropts -m0755 -o squid -g squid + keepdir /var/cache/squid /var/log/squid +} + +pkg_postinst() { + ewarn "Squid authentication helpers have been installed suid root." + ewarn "This allows for shadow based authentication (see bug #52977 for more)." + ewarn + ewarn "Be careful what type of cache_dir you select!" + ewarn "'diskd' is optimized for high levels of traffic, but it might seem slow" + ewarn "where there isn't sufficient traffic to keep squid reasonably busy." + ewarn "If your traffic level is low to moderate, use 'aufs' or 'ufs'." + ewarn + ewarn "Squid can be configured to run in transparent mode like this:" + ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" + + if use zero-penalty-hit; then + echo + ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" + ewarn "with the patch that can be found on http://zph.bratcheda.org site." + fi +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sys-cluster/zookeeper/Manifest Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,2 @@ +DIST zookeeper-3.3.1.tar.gz 10279804 RMD160 a911202f6271901cc6fb4b64306808f64bff6e99 SHA1 683f439c149fdeaad996eb88d84caa2f2fc756c5 SHA256 dc77ef79aea6b19d418110e9a1e916cb4c26ceb7b3acb6792af32eb2a97ea536 +EBUILD zookeeper-3.3.1.ebuild 1522 RMD160 05f6dc9a9aa92f3444bd3233061a9c22749acb79 SHA1 add0d228a8885af2aea4273314147c65ffe716da SHA256 521bd45843722d5ed0be7da8371616edc276b509ec8c5a26dc46dd640ef53033
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sys-cluster/zookeeper/zookeeper-3.3.1.ebuild Wed Aug 11 04:08:09 2010 +0200 @@ -0,0 +1,71 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils java-utils-2 + +MY_PN="${PN/apache-/}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="ZooKeeper is a high-performance coordination service for +distributed applications." +HOMEPAGE="http://hadoop.apache.org/" +SRC_URI="mirror://apache/hadoop/${MY_PN}/${MY_P}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +RESTRICT="mirror binchecks" +IUSE="" + +DEPEND="" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${MY_P}" +INSTALL_DIR=/opt/"${PN}" +DATA_DIR=/var/db/"${PN}" +export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf" + +src_install() { + dodir "${DATA_DIR}" + sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed" + + dodir "${INSTALL_DIR}" + mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed" + + # env file + cat > 99"${PN}" <<-EOF + PATH=${INSTALL_DIR}/bin + CONFIG_PROTECT=${INSTALL_DIR}/conf + EOF + doenvd 99"${PN}" || die "doenvd failed" + + cat > "${PN}" <<-EOF + #!/sbin/runscript + + opts="start stop restart" + + start() { + ${INSTALL_DIR}/bin/zkServer.sh start > /dev/null + } + + stop() { + ${INSTALL_DIR}/bin/zkServer.sh stop + } + + restart() { + ${INSTALL_DIR}/bin/zkServer.sh restart > /dev/null + } + + status() { + ${INSTALL_DIR}/bin/zkServer.sh status + } + EOF + doinitd "${PN}" || die "doinitd failed" +} + +pkg_postinst() { + elog "For info on configuration see http://hadoop.apache.org/${MY_PN}/docs/r${PV}" +}