Mercurial > hg > portage
changeset 281:34ae6a0a3fe8
pull all the latest changes from Holgi
| author | Dirk Olmes <dirk@xanthippe.ping.de> |
|---|---|
| date | Fri, 01 Apr 2011 17:58:34 +0200 |
| parents | 8679a9a2a216 (diff) 84669d0adbe8 (current diff) |
| children | b4c93c3d782b |
| files | dev-java/maven-bin/Manifest layman/.keep_app-portage_layman-0 net-misc/rabbitmq-server/Manifest |
| diffstat | 46 files changed, 1892 insertions(+), 1167 deletions(-) [+] |
line wrap: on
line diff
--- a/app-admin/eselect-maven/Manifest Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -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
--- a/app-admin/eselect-maven/eselect-maven-0.2.ebuild Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# 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" -}
--- a/app-admin/eselect-maven/files/maven-0.2.eselect Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,175 +0,0 @@ -# -*-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 Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -AUX pgpool-II.init 397 RMD160 982661c7ed406af8cee485aec125a3c28320d008 SHA1 b0433f446f98acd2ca82930f073c6fd886ce19a7 SHA256 fc1f92d95d198a4fa7a4ae3e0bbad5ba093667c068550bd6a18bc86ab61252fa -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/files/pgpool-II.init Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting pgpool-II" - start-stop-daemon --start --quiet --exec /usr/bin/pgpool - result=$? - eend $result -} - -stop() { - ebegin "Stopping pgpool-II" - start-stop-daemon --stop --quiet --exec /usr/bin/pgpool - result=$? - eend $result -}
--- a/dev-db/pgpool-II/pgpool-II-2.3.3.ebuild Fri Apr 01 17:52:02 2011 +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/postgresql-base/Manifest Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,5 @@ +AUX postgresql-9.0-base.3.patch 4961 RMD160 2c9d53ddfeab3fb162c1423e362ae01f54318089 SHA1 9a285971587eca1733d441b2440804dd12597979 SHA256 35c555da25ae4a5e4d00ce74a0130e140e70ed23d12f526bef06c866fdd78362 +AUX postgresql-9.0-common.3.patch 782 RMD160 b826f93738443d7330752babf838b3706351f921 SHA1 af928e62ccd161366e3f6fccf8b47eeb4f4ae1dd SHA256 0339ed502e035330feb62e66927804a1b7506163cb584a152abdd2987f210d33 +DIST postgresql-9.0.2.tar.bz2 14024244 RMD160 3313b4bafe3af6282f68f198da7d50af4d5c01c4 SHA1 42a9518a2f11fa1d09a23bc628b00e992d3bcf4a SHA256 ffb58195850aa0ec9b7b3dcdac51a6dee0c76ea3387b76c805e1c4d186fe2af5 +EBUILD postgresql-base-9.0.2.ebuild 4488 RMD160 316b1cba8990ae6b8617058474ab4e1c0b9b5b98 SHA1 04ff208b7b0de70eeab5f32e11c0120c2801f67d SHA256 fc7279089b216ad47a2b8edec31fcf594bc2ec4d520646dab0e460cced5f6d63 +MISC metadata.xml 472 RMD160 fe3dc42a49cd1445788d023578d878c6226c72e0 SHA1 f03eda301fc89bf31cfb64bb6cc2cc4ca33cb632 SHA256 ee20753f4083988318c4c30155901e99a800dc8fb19fd77c80f9947c72abbf4c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-base/files/postgresql-9.0-base.3.patch Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,147 @@ +diff -Naur postgresql-9.0beta3.orig/contrib/Makefile postgresql-9.0beta3/contrib/Makefile +--- postgresql-9.0beta3.orig/contrib/Makefile 2010-06-14 12:17:56.000000000 -0400 ++++ postgresql-9.0beta3/contrib/Makefile 2010-07-11 23:41:57.680531730 -0400 +@@ -5,51 +5,14 @@ + include $(top_builddir)/src/Makefile.global + + SUBDIRS = \ +- adminpack \ +- auto_explain \ +- btree_gin \ +- btree_gist \ +- chkpass \ +- citext \ +- cube \ +- dblink \ +- dict_int \ +- dict_xsyn \ +- earthdistance \ +- fuzzystrmatch \ +- hstore \ +- intagg \ +- intarray \ +- isn \ +- lo \ +- ltree \ + oid2name \ +- pageinspect \ + passwordcheck \ +- pg_archivecleanup \ +- pg_buffercache \ +- pg_freespacemap \ +- pg_standby \ +- pg_stat_statements \ +- pg_trgm \ + pg_upgrade \ + pg_upgrade_support \ + pgbench \ +- pgcrypto \ +- pgrowlocks \ +- pgstattuple \ +- seg \ +- spi \ +- tablefunc \ +- test_parser \ +- tsearch2 \ + unaccent \ + vacuumlo + +-ifeq ($(with_openssl),yes) +-SUBDIRS += sslinfo +-endif +- + ifeq ($(with_ossp_uuid),yes) + SUBDIRS += uuid-ossp + endif +diff -Naur postgresql-9.0beta3.orig/src/backend/Makefile postgresql-9.0beta3/src/backend/Makefile +--- postgresql-9.0beta3.orig/src/backend/Makefile 2010-07-05 14:54:37.000000000 -0400 ++++ postgresql-9.0beta3/src/backend/Makefile 2010-07-11 23:46:58.347527452 -0400 +@@ -45,7 +45,7 @@ + + ########################################################################## + +-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP) ++all: someheaders + + ifneq ($(PORTNAME), cygwin) + ifneq ($(PORTNAME), win32) +@@ -114,7 +114,7 @@ + endif # aix + + # Update the commonly used headers before building the subdirectories +-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h ++someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h + + # run this unconditionally to avoid needing to know its dependencies here: + submake-schemapg: +@@ -191,23 +191,7 @@ + + ########################################################################## + +-install: all installdirs install-bin +-ifeq ($(PORTNAME), cygwin) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +-ifeq ($(PORTNAME), win32) +-ifeq ($(MAKE_DLL), true) +- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a' +-endif +-endif +- $(MAKE) -C catalog install-data +- $(MAKE) -C tsearch install-data +- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' +- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' +- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' +- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample' ++install: + + install-bin: postgres $(POSTGRES_IMP) installdirs + $(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)' +diff -Naur postgresql-9.0beta3.orig/src/bin/Makefile postgresql-9.0beta3/src/bin/Makefile +--- postgresql-9.0beta3.orig/src/bin/Makefile 2010-01-02 11:57:58.000000000 -0500 ++++ postgresql-9.0beta3/src/bin/Makefile 2010-07-11 23:50:10.762585482 -0400 +@@ -13,8 +13,7 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-SUBDIRS = initdb pg_ctl pg_dump \ +- psql scripts pg_config pg_controldata pg_resetxlog ++SUBDIRS = pg_dump psql scripts pg_config + ifeq ($(PORTNAME), win32) + SUBDIRS+=pgevent + endif +diff -Naur postgresql-9.0beta3.orig/src/include/pg_config_manual.h postgresql-9.0beta3/src/include/pg_config_manual.h +--- postgresql-9.0beta3.orig/src/include/pg_config_manual.h 2010-01-06 23:53:35.000000000 -0500 ++++ postgresql-9.0beta3/src/include/pg_config_manual.h 2010-07-11 23:51:39.925527262 -0400 +@@ -141,7 +141,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and +diff -Naur postgresql-9.0beta3.orig/src/Makefile postgresql-9.0beta3/src/Makefile +--- postgresql-9.0beta3.orig/src/Makefile 2010-01-20 04:16:23.000000000 -0500 ++++ postgresql-9.0beta3/src/Makefile 2010-07-11 23:53:43.768528995 -0400 +@@ -15,17 +15,12 @@ + + all install installdirs uninstall distprep: + $(MAKE) -C port $@ +- $(MAKE) -C timezone $@ + $(MAKE) -C backend $@ +- $(MAKE) -C backend/utils/mb/conversion_procs $@ +- $(MAKE) -C backend/snowball $@ + $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C backend/replication/libpqwalreceiver $@ + $(MAKE) -C bin $@ +- $(MAKE) -C pl $@ + $(MAKE) -C makefiles $@ +- $(MAKE) -C test/regress $@ + + install: install-local +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-base/files/postgresql-9.0-common.3.patch Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,14 @@ +diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in +--- postgresql-9.0beta3.orig/configure.in 2010-07-08 22:43:12.000000000 -0400 ++++ postgresql-9.0beta3/configure.in 2010-07-12 00:13:37.585527031 -0400 +@@ -19,10 +19,6 @@ + + AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-base/metadata.xml Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>postgresql</herd> +<use> + <flag name='pg-intdatetime'>Enable --enable-integer-datetimes configure + option, which changes PG to use 64-bit integers for timestamp storage</flag> + <flag name='pg_legacytimestamp'>Use double precision floating-point numbers + instead of 64-bit integers for timestamp storage. + </flag> + +</use> +</pkgmetadata>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-base/postgresql-base-9.0.2.ebuild Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,155 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-base/postgresql-base-9.0.1.ebuild,v 1.1 2010/10/06 14:57:13 patrick Exp $ + +EAPI="2" + +WANT_AUTOMAKE="none" + +inherit eutils multilib versionator autotools + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" + +DESCRIPTION="PostgreSQL libraries and clients" +HOMEPAGE="http://www.postgresql.org/" + +MY_PV=${PV/_/} +SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" +S=${WORKDIR}/postgresql-${MY_PV} + +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW" +IUSE="doc kerberos ldap nls pam pg_legacytimestamp readline ssl threads zlib" + +for lingua in ${LINGUAS}; do + IUSE+=" linguas_${lingua}" +done + +RESTRICT="test" + +wanted_languages() { + local enable_langs + + for lingua in ${LINGUAS} ; do + use linguas_${lingua} && enable_langs+="${lingua} " + done + + echo -n ${enable_langs} +} + +RDEPEND="!!dev-db/postgresql-libs + !!dev-db/postgresql-client + !!dev-db/libpq + !!dev-db/postgresql + >=app-admin/eselect-postgresql-0.3 + virtual/libintl + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + pam? ( virtual/pam ) + readline? ( sys-libs/readline ) + ssl? ( >=dev-libs/openssl-0.9.6-r1 ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + sys-devel/bison + sys-devel/flex + nls? ( sys-devel/gettext )" +PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" + +src_prepare() { + epatch "${FILESDIR}/postgresql-9.0-common.3.patch" \ + "${FILESDIR}/postgresql-${SLOT}-base.3.patch" + + # to avoid collision - it only should be installed by server + rm "${S}/src/backend/nls.mk" + + # because psql/help.c includes the file + ln -s "${S}/src/include/libpq/pqsignal.h" "${S}/src/bin/psql/" || die + + eautoconf +} + +src_configure() { + export LDFLAGS_SL="${LDFLAGS}" + econf \ + --prefix=/usr/$(get_libdir)/postgresql-${SLOT} \ + --datadir=/usr/share/postgresql-${SLOT} \ + --docdir=/usr/share/doc/postgresql-${SLOT} \ + --sysconfdir=/etc/postgresql-${SLOT} \ + --includedir=/usr/include/postgresql-${SLOT} \ + --mandir=/usr/share/postgresql-${SLOT}/man \ + --enable-depend \ + --without-tcl \ + --without-perl \ + --without-python \ + $(use_with readline) \ + $(use_with kerberos krb5) \ + $(use_with kerberos gssapi) \ + "$(use_enable nls nls "$(wanted_languages)")" \ + $(use_with pam) \ + $(use_enable !pg_legacytimestamp integer-datetimes) \ + $(use_with ssl openssl) \ + $(use_enable threads thread-safety) \ + $(use_with zlib) \ + $(use_with ldap) +} + +src_compile() { + emake || die "emake failed" + + cd "${S}/contrib" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + insinto /usr/include/postgresql-${SLOT}/postmaster + doins "${S}"/src/include/postmaster/*.h || die + + dodir /usr/share/postgresql-${SLOT}/man/man1/ || die + cp "${S}"/doc/src/sgml/man1/* "${D}"/usr/share/postgresql-${SLOT}/man/man1/ || die + + rm "${D}/usr/share/postgresql-${SLOT}/man/man1"/{initdb,ipcclean,pg_controldata,pg_ctl,pg_resetxlog,pg_restore,postgres,postmaster}.1 + dodoc README HISTORY doc/{README.*,TODO,bug.template} || die + + cd "${S}/contrib" + emake DESTDIR="${D}" install || die "emake install failed" + cd "${S}" + + dodir /etc/eselect/postgresql/slots/${SLOT} || die + + IDIR="/usr/include/postgresql-${SLOT}" + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/base" <<-__EOF__ +postgres_ebuilds="\${postgres_ebuilds} ${PF}" +postgres_prefix=/usr/$(get_libdir)/postgresql-${SLOT} +postgres_datadir=/usr/share/postgresql-${SLOT} +postgres_bindir=/usr/$(get_libdir)/postgresql-${SLOT}/bin +postgres_symlinks=( + ${IDIR} /usr/include/postgresql + ${IDIR}/libpq-fe.h /usr/include/libpq-fe.h + ${IDIR}/pg_config_manual.h /usr/include/pg_config_manual.h + ${IDIR}/libpq /usr/include/libpq + ${IDIR}/postgres_ext.h /usr/include/postgres_ext.h +) +__EOF__ + + cat >"${T}/50postgresql-94-${SLOT}" <<-__EOF__ +LDPATH=/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir) +MANPATH=/usr/share/postgresql-${SLOT}/man +__EOF__ + doenvd "${T}/50postgresql-94-${SLOT}" || die + + keepdir /etc/postgresql-${SLOT} || die +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + elog "If you need a global psqlrc-file, you can place it in:" + elog " '${ROOT}/etc/postgresql-${SLOT}/'" + elog +} + +pkg_postrm() { + eselect postgresql update +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-server/Manifest Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,7 @@ +AUX postgresql-9.0-common.3.patch 782 RMD160 b826f93738443d7330752babf838b3706351f921 SHA1 af928e62ccd161366e3f6fccf8b47eeb4f4ae1dd SHA256 0339ed502e035330feb62e66927804a1b7506163cb584a152abdd2987f210d33 +AUX postgresql-9.0-server.3.patch 8076 RMD160 03883f576e9307876fa47236b498f0dd9e833d8f SHA1 bc640b3bafff25d21bb1f274b3e1d05bc00bc474 SHA256 0e0c13d3cea708dc5d512a53ace1b77ff3c94f2cde98815e417cc2fba70481c7 +AUX postgresql.conf-9.0-r1 1691 RMD160 752a860bf07f4bc0b340179d460a965aa6908820 SHA1 13b1c810e402bc67b940b721bde7872f6ec078ed SHA256 389c104d73647b9e9199d93836f8b38c280a844e3e1f1d39552871be0023b7bd +AUX postgresql.init-9.0-r1 3861 RMD160 f8c9a1d874e81932e6df6dcb0c68287dad68d44f SHA1 ac761e2b0d95e5d87422f8552427987363fd8894 SHA256 707a65b4fe1b5f379a7fc865c81e9ba083b4dab0dab8652c2fbe1174a1fc7c46 +DIST postgresql-9.0.2.tar.bz2 14024244 RMD160 3313b4bafe3af6282f68f198da7d50af4d5c01c4 SHA1 42a9518a2f11fa1d09a23bc628b00e992d3bcf4a SHA256 ffb58195850aa0ec9b7b3dcdac51a6dee0c76ea3387b76c805e1c4d186fe2af5 +EBUILD postgresql-server-9.0.2.ebuild 10183 RMD160 5f255d1dfea7a0f9552dcad297120a4c3033bbe4 SHA1 a6b66a74c613e8f51fb31fb1f7dfff20bd6c68f7 SHA256 48896f6c81687bb650bffb309dd4502f7a005b380a34e2277b9ff330d528cc25 +MISC metadata.xml 420 RMD160 789f5a0ce45d05125098fd7e74a816cf08f4c39b SHA1 d308d7434a37f12cd320f74ed85e1d3ca7dabc75 SHA256 ac37a5084450a782d02510149d030bd0d4a63164f2ffb7bdda3ddf344606ca62
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-server/files/postgresql-9.0-common.3.patch Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,14 @@ +diff -Naur postgresql-9.0beta3.orig/configure.in postgresql-9.0beta3/configure.in +--- postgresql-9.0beta3.orig/configure.in 2010-07-08 22:43:12.000000000 -0400 ++++ postgresql-9.0beta3/configure.in 2010-07-12 00:13:37.585527031 -0400 +@@ -19,10 +19,6 @@ + + AC_INIT([PostgreSQL], [9.0beta3], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. +-Untested combinations of 'autoconf' and PostgreSQL versions are not +-recommended. You can remove the check from 'configure.in' but it is then +-your responsibility whether the result works or not.])]) + AC_COPYRIGHT([Copyright (c) 1996-2010, PostgreSQL Global Development Group]) + AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) + AC_CONFIG_AUX_DIR(config)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-server/files/postgresql-9.0-server.3.patch Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,213 @@ +diff -Naur postgresql-9.0beta3.orig/contrib/adminpack/Makefile postgresql-9.0beta3/contrib/adminpack/Makefile +--- postgresql-9.0beta3.orig/contrib/adminpack/Makefile 2007-11-10 18:59:50.000000000 -0500 ++++ postgresql-9.0beta3/contrib/adminpack/Makefile 2010-07-12 08:41:54.894528045 -0400 +@@ -1,7 +1,7 @@ + # $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $ + + MODULE_big = adminpack +-PG_CPPFLAGS = -I$(libpq_srcdir) ++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/ + DATA_built = adminpack.sql + DATA = uninstall_adminpack.sql + OBJS = adminpack.o +diff -Naur postgresql-9.0beta3.orig/contrib/dblink/Makefile postgresql-9.0beta3/contrib/dblink/Makefile +--- postgresql-9.0beta3.orig/contrib/dblink/Makefile 2007-11-10 18:59:50.000000000 -0500 ++++ postgresql-9.0beta3/contrib/dblink/Makefile 2010-07-12 08:41:54.894528045 -0400 +@@ -1,7 +1,7 @@ + # $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $ + + MODULE_big = dblink +-PG_CPPFLAGS = -I$(libpq_srcdir) ++PG_CPPFLAGS = -I$(libpq_srcdir) -I../../src/include/ + OBJS = dblink.o + SHLIB_LINK = $(libpq) + +diff -Naur postgresql-9.0beta3.orig/contrib/Makefile postgresql-9.0beta3/contrib/Makefile +--- postgresql-9.0beta3.orig/contrib/Makefile 2010-06-14 12:17:56.000000000 -0400 ++++ postgresql-9.0beta3/contrib/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -23,18 +23,13 @@ + isn \ + lo \ + ltree \ +- oid2name \ + pageinspect \ +- passwordcheck \ + pg_archivecleanup \ + pg_buffercache \ + pg_freespacemap \ + pg_standby \ + pg_stat_statements \ + pg_trgm \ +- pg_upgrade \ +- pg_upgrade_support \ +- pgbench \ + pgcrypto \ + pgrowlocks \ + pgstattuple \ +@@ -42,9 +37,7 @@ + spi \ + tablefunc \ + test_parser \ +- tsearch2 \ +- unaccent \ +- vacuumlo ++ tsearch2 + + ifeq ($(with_openssl),yes) + SUBDIRS += sslinfo +diff -Naur postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile postgresql-9.0beta3/contrib/uuid-ossp/Makefile +--- postgresql-9.0beta3.orig/contrib/uuid-ossp/Makefile 2007-11-12 19:13:19.000000000 -0500 ++++ postgresql-9.0beta3/contrib/uuid-ossp/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -1,11 +1,13 @@ + # $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $ + ++PG_CPPFLAGS += "-DHAVE_OSSP_UUID_H" ++ + MODULE_big = uuid-ossp + OBJS = uuid-ossp.o + DATA_built = uuid-ossp.sql + DATA = uninstall_uuid-ossp.sql + +-SHLIB_LINK += $(OSSP_UUID_LIBS) ++SHLIB_LINK += -lossp-uuid + + ifdef USE_PGXS + PG_CONFIG = pg_config +diff -Naur postgresql-9.0beta3.orig/contrib/xml2/Makefile postgresql-9.0beta3/contrib/xml2/Makefile +--- postgresql-9.0beta3.orig/contrib/xml2/Makefile 2010-03-01 13:07:59.000000000 -0500 ++++ postgresql-9.0beta3/contrib/xml2/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -4,7 +4,8 @@ + + OBJS = xpath.o xslt_proc.o + +-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS)) ++PG_CPPFLAGS = $(shell xml2-config --cflags) ++SHLIB_LINK += $(shell xml2-config --libs) $(shell xslt-config --libs) + + DATA_built = pgxml.sql + DATA = uninstall_pgxml.sql +diff -Naur postgresql-9.0beta3.orig/GNUmakefile.in postgresql-9.0beta3/GNUmakefile.in +--- postgresql-9.0beta3.orig/GNUmakefile.in 2010-03-29 20:10:46.000000000 -0400 ++++ postgresql-9.0beta3/GNUmakefile.in 2010-07-12 08:41:54.895528185 -0400 +@@ -10,7 +10,6 @@ + + all: + $(MAKE) -C src all +- $(MAKE) -C config all + @echo "All of PostgreSQL successfully made. Ready to install." + + docs: +@@ -28,7 +27,6 @@ + + install: + $(MAKE) -C src $@ +- $(MAKE) -C config $@ + @echo "PostgreSQL installation complete." + + install-docs: +@@ -44,7 +42,6 @@ + installdirs uninstall coverage: + $(MAKE) -C doc $@ + $(MAKE) -C src $@ +- $(MAKE) -C config $@ + + distprep: + $(MAKE) -C doc $@ +diff -Naur postgresql-9.0beta3.orig/src/bin/initdb/Makefile postgresql-9.0beta3/src/bin/initdb/Makefile +--- postgresql-9.0beta3.orig/src/bin/initdb/Makefile 2010-07-05 14:54:37.000000000 -0400 ++++ postgresql-9.0beta3/src/bin/initdb/Makefile 2010-07-12 08:41:54.895528185 -0400 +@@ -16,7 +16,7 @@ + top_builddir = ../../.. + include $(top_builddir)/src/Makefile.global + +-override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS) ++override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/libpq $(CPPFLAGS) + + OBJS= initdb.o encnames.o pqsignal.o $(WIN32RES) + +diff -Naur postgresql-9.0beta3.orig/src/bin/Makefile postgresql-9.0beta3/src/bin/Makefile +--- postgresql-9.0beta3.orig/src/bin/Makefile 2010-01-02 11:57:58.000000000 -0500 ++++ postgresql-9.0beta3/src/bin/Makefile 2010-07-12 08:41:54.896527913 -0400 +@@ -13,8 +13,8 @@ + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + +-SUBDIRS = initdb pg_ctl pg_dump \ +- psql scripts pg_config pg_controldata pg_resetxlog ++SUBDIRS = initdb pg_ctl \ ++ pg_controldata pg_resetxlog + ifeq ($(PORTNAME), win32) + SUBDIRS+=pgevent + endif +diff -Naur postgresql-9.0beta3.orig/src/include/pg_config_manual.h postgresql-9.0beta3/src/include/pg_config_manual.h +--- postgresql-9.0beta3.orig/src/include/pg_config_manual.h 2010-01-06 23:53:35.000000000 -0500 ++++ postgresql-9.0beta3/src/include/pg_config_manual.h 2010-07-12 08:41:54.896527913 -0400 +@@ -141,7 +141,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and +diff -Naur postgresql-9.0beta3.orig/src/Makefile postgresql-9.0beta3/src/Makefile +--- postgresql-9.0beta3.orig/src/Makefile 2010-01-20 04:16:23.000000000 -0500 ++++ postgresql-9.0beta3/src/Makefile 2010-07-12 08:41:54.896527913 -0400 +@@ -19,15 +19,11 @@ + $(MAKE) -C backend $@ + $(MAKE) -C backend/utils/mb/conversion_procs $@ + $(MAKE) -C backend/snowball $@ +- $(MAKE) -C include $@ +- $(MAKE) -C interfaces $@ +- $(MAKE) -C backend/replication/libpqwalreceiver $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ +- $(MAKE) -C makefiles $@ + $(MAKE) -C test/regress $@ + +-install: install-local ++install: + + install-local: installdirs-local + $(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global' +diff -Naur postgresql-9.0beta3.orig/src/Makefile.global.in postgresql-9.0beta3/src/Makefile.global.in +--- postgresql-9.0beta3.orig/src/Makefile.global.in 2010-07-06 18:03:05.000000000 -0400 ++++ postgresql-9.0beta3/src/Makefile.global.in 2010-07-12 08:41:54.897527811 -0400 +@@ -458,6 +458,7 @@ + LDFLAGS += $(PROFILE) + endif + ++CFLAGS += -I${top_srcdir}/src/include + + ########################################################################## + # +diff -Naur postgresql-9.0beta3.orig/src/port/Makefile postgresql-9.0beta3/src/port/Makefile +--- postgresql-9.0beta3.orig/src/port/Makefile 2010-07-02 13:03:30.000000000 -0400 ++++ postgresql-9.0beta3/src/port/Makefile 2010-07-12 08:41:54.898529044 -0400 +@@ -39,11 +39,10 @@ + # foo_srv.o and foo.o are both built from foo.c, but only foo.o has -DFRONTEND + OBJS_SRV = $(OBJS:%.o=%_srv.o) + +-all: libpgport.a libpgport_srv.a ++all: libpgport_srv.a + + # libpgport is needed by some contrib +-install: all installdirs +- $(INSTALL_STLIB) libpgport.a '$(DESTDIR)$(libdir)/libpgport.a' ++install: + + installdirs: + $(MKDIR_P) '$(DESTDIR)$(libdir)' +diff -Naur postgresql-9.0beta3.orig/src/test/regress/GNUmakefile postgresql-9.0beta3/src/test/regress/GNUmakefile +--- postgresql-9.0beta3.orig/src/test/regress/GNUmakefile 2010-07-05 14:54:38.000000000 -0400 ++++ postgresql-9.0beta3/src/test/regress/GNUmakefile 2010-07-12 08:41:54.898529044 -0400 +@@ -141,7 +141,7 @@ + pg_regress_call = ./pg_regress --inputdir=$(srcdir) --dlpath=. --multibyte=$(MULTIBYTE) $(NOLOCALE) + + check: all +- $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) ++ $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) --psqldir=/usr/lib/postgresql-${SLOT}/bin/ + + installcheck: all + $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-server/files/postgresql.conf-9.0-r1 Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,50 @@ +# PostgreSQL's Database Directory +PGDATA="/var/lib/postgresql/9.0/data" + +# Options to pass to PostgreSQL's initdb. +#PG_INITDB_OPTS="--locale=en_US.UTF-8" + +# PostgreSQL User +PGUSER="postgres" + +# Which port and socket to bind PostgreSQL +PGPORT="5432" + +# Extra options to run postmaster with, e.g.: +# -N is the maximal number of client connections +# -B is the number of shared buffers and has to be at least 2x the value for -N +# Please read the man-page to postmaster for more options. Many of +# these options can be set directly in the configuration file. +#PGOPTS="-N 512 -B 1024" + +# Allow *_TIMEOUT to run its course. +# Can be overriden by changing to '-W' (capital W) +WAIT_FOR_START="-w" +WAIT_FOR_STOP="-w" + +# How long to wait for server to start in seconds +START_TIMEOUT=60 + +# Ignore new connections and wait for clients to disconnect from server before +# shutting down. +# Set NICE_QUIT to "NO" to disable. NICE_TIMEOUT in seconds. +NICE_QUIT="YES" +NICE_TIMEOUT=60 + +# Forecfully disconnect clients from server and shut down. This is performed +# after NICE_QUIT. Terminating a client results in a rollback of open +# transactions for that client. +# Set RUDE_QUIT to "NO" to disable. RUDE_TIMEOUT in seconds. +RUDE_QUIT="YES" +RUDE_TIMEOUT=30 + +# If the server still fails to shutdown, you can force it to quit by setting +# this to yes and a recover-run will execute on the next startup. +# Set FORCE_QUIT to "YES" to enable. FORCE_TIMEOUT in seconds. +FORCE_QUIT="NO" +FORCE_TIMEOUT=2 + +# Pass extra environment variables. If you have to export environment variables +# for the database process, this can be done here. +# Don't forget to escape quotes. +#PG_EXTRA_ENV="PGPASSFILE=\"/path/to/.pgpass\""
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-server/files/postgresql.init-9.0-r1 Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,136 @@ +#!/sbin/runscript +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-9.0-r1,v 1.1 2010/06/04 14:18:52 patrick Exp $ + +opts="${opts} reload" + +depend() { + use net + if [ -L /etc/eselect/postgresql/service ] ; then + local p_service="$(for f in /etc/eselect/postgresql/service/* ; do . $f ; done ; echo $postgres_service )" + test "${p_service}" = "${SVCNAME}" && provide postgresql + fi +} + +checkconfig() { + if [ ! -d "$PGDATA" ] ; then + eerror "Directory not found: $PGDATA" + eerror "Please make sure that PGDATA points to the right path." + eerror "You can run 'emerge postgresql-server --config' to setup a new database cluster." + return 1 + fi +} + +start() { + checkconfig || return 1 + + ebegin "Starting PostgreSQL" + + if [ -f "$PGDATA/postmaster.pid" ] ; then + rm -f "$PGDATA/postmaster.pid" + fi + + local retval + + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl start ${WAIT_FOR_START} -t ${START_TIMEOUT} -s -o '--silent-mode=true ${PGOPTS}'" + retval=$? + + if [[ $retval != 0 ]] ; then + eend $retval + return $retval + fi + +# The following is to catch the case of an already running server +# in which pg_ctl doesn't know to which server it connected to and +# falsely reports the server as 'up' + sleep 2 + if [ ! -f "$PGDATA/postmaster.pid" ] ; then + eerror "The PID file doesn't exist but pg_ctl reported a running server." + eerror "Please check whether there is another server running on the same port or read the log-file." + eend 1 + return 1 + fi + + local pid=$(grep "^[0-9]\+" "$PGDATA/postmaster.pid") + ps -p "${pid}" &> /dev/null + eend $? +} + +stop() { + ebegin "Stopping PostgreSQL (this can take up to $(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} )) seconds)" + + local retval + + if [[ "${NICE_QUIT}" != "NO" ]] ; then + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${NICE_TIMEOUT} -s -m smart" + retval=$? + + if [[ $retval == 0 ]] ; then + eend $retval + return $retval + fi + + ewarn "Shutting down the server gracefully failed." + ewarn "Probably because some clients did not disconnect within ${NICE_TIMEOUT} seconds." + else + ewarn "NICE_QUIT disabled." + ewarn "You really should have it enabled." + fi + + if [[ "${RUDE_QUIT}" != "NO" ]] ; then + ewarn "RUDE_QUIT enabled." + ewarn "Going to shutdown the server anyway." + + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${RUDE_TIMEOUT} -s -m fast" + retval=$? + + if [[ $retval == 0 ]] ; then + eend $retval + return $retval + fi + + eerror "Failed to shutdown server." + else + ewarn "RUDE_QUIT disabled." + fi + + if [[ "${FORCE_QUIT}" == "YES" ]] ; then + ewarn "FORCE_QUIT enabled." + ewarn "Forcing server to shutdown." + ewarn "A recover-run will be executed on the next startup." + + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl stop ${WAIT_FOR_STOP} -t ${FORCE_TIMEOUT} -s -m immediate" + + retval=$? + + if [[ $retval == 0 ]] ; then + ewarn "Server forced down." + eend $retval + return $retval + fi + + eerror "Forced shutdown failed!!!" + eerror "Something is wrong with your system." + eerror "Please take care of it manually." + eerror "Unable to stop server." + eend $retval + return $retval + else + ewarn "FORCE_QUIT disabled." + eerror "Unable to shutdown server." + eend 1 + return 1 + fi +} + +reload() { + ebegin "Reloading PostgreSQL configuration" + su -l ${PGUSER} \ + -c "env PGDATA=\"${PGDATA}\" PGPORT=\"${PGPORT}\" ${PG_EXTRA_ENV} /usr/lib/postgresql-9.0/bin/pg_ctl reload -s" + eend $? +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-server/metadata.xml Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>postgresql</herd> +<use> + <flag name='uuid'>Enable server side UUID generation + (via <pkg>dev-libs/ossp-uuid</pkg>)</flag> + <flag name='pg_legacytimestamp'>Use double precision floating-point numbers + instead of 64-bit integers for timestamp storage. + </flag> +</use> +</pkgmetadata>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-db/postgresql-server/postgresql-server-9.0.2.ebuild Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,282 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/postgresql-server-9.0.1.ebuild,v 1.1 2010/10/06 14:58:10 patrick Exp $ + +EAPI="2" +PYTHON_DEPEND="python? 2" + +# weird test failures. +RESTRICT="test" + +WANT_AUTOMAKE="none" +inherit autotools eutils multilib python versionator + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +DESCRIPTION="PostgreSQL server" +HOMEPAGE="http://www.postgresql.org/" + +MY_PV=${PV/_/} +SRC_URI="mirror://postgresql/source/v${MY_PV}/postgresql-${MY_PV}.tar.bz2" +S=${WORKDIR}/postgresql-${MY_PV} + +LICENSE="POSTGRESQL" +SLOT="$(get_version_component_range 1-2)" +LINGUAS="af cs de es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN zh_TW" +IUSE="doc kernel_linux nls perl pg_legacytimestamp python selinux tcl uuid xml" + +for lingua in ${LINGUAS}; do + IUSE+=" linguas_${lingua}" +done + +wanted_languages() { + local enable_langs + + for lingua in ${LINGUAS} ; do + use linguas_${lingua} && enable_langs+="${lingua} " + done + + echo -n ${enable_langs} +} + +RDEPEND="~dev-db/postgresql-base-${PV}:${SLOT}[pg_legacytimestamp=,nls=] + perl? ( >=dev-lang/perl-5.6.1-r2 ) + python? ( dev-python/egenix-mx-base ) + selinux? ( sec-policy/selinux-postgresql ) + tcl? ( >=dev-lang/tcl-8 ) + uuid? ( dev-libs/ossp-uuid ) + xml? ( dev-libs/libxml2 dev-libs/libxslt )" +DEPEND="${RDEPEND} + sys-devel/flex + xml? ( dev-util/pkgconfig )" +PDEPEND="doc? ( ~dev-db/postgresql-docs-${PV} )" + +pkg_setup() { + enewgroup postgres 70 + enewuser postgres 70 /bin/bash /var/lib/postgresql postgres + + if use python; then + python_set_active_version 2 + fi +} + +src_prepare() { + epatch "${FILESDIR}/postgresql-${SLOT}-common.3.patch" \ + "${FILESDIR}/postgresql-${SLOT}-server.3.patch" + + if use test; then + sed -e "s|/no/such/location|${S}/src/test/regress/tmp_check/no/such/location|g" -i src/test/regress/{input,output}/tablespace.source + else + echo "all install:" > "${S}/src/test/regress/GNUmakefile" + fi + + eautoconf +} + +src_configure() { + # eval is needed to get along with pg_config quotation of space-rich entities. + eval econf "$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --configure)" \ + --disable-thread-safety \ + $(use_with perl) \ + $(use_with python) \ + $(use_with tcl) \ + $(use_with xml libxml) \ + $(use_with xml libxslt) \ + $(use_with uuid ossp-uuid) \ + --with-system-tzdata="/usr/share/zoneinfo" \ + --with-includes="/usr/include/postgresql-${SLOT}/" \ + --with-libraries="/usr/$(get_libdir)/postgresql-${SLOT}/$(get_libdir)" \ + "$(use_enable nls nls "$(wanted_languages)")" +} + +src_compile() { + local bd + for bd in . contrib $(use xml && echo contrib/xml2); do + PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ + emake -C $bd -j1 || die "emake in $bd failed" + done +} + +src_install() { + if use perl ; then + mv -f "${S}/src/pl/plperl/GNUmakefile" "${S}/src/pl/plperl/GNUmakefile_orig" + sed -e "s:\$(DESTDIR)\$(plperl_installdir):\$(plperl_installdir):" \ + "${S}/src/pl/plperl/GNUmakefile_orig" > "${S}/src/pl/plperl/GNUmakefile" + fi + + for bd in . contrib $(use xml && echo contrib/xml2) ; do + PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ + emake install -C $bd -j1 DESTDIR="${D}" || die "emake install in $bd failed" + done + + rm -rf "${D}/usr/share/postgresql-${SLOT}/man/man7/" "${D}/usr/share/doc/postgresql-${SLOT}/html" + rm "${D}"/usr/share/postgresql-${SLOT}/man/man1/{clusterdb,create{db,lang,user},drop{db,lang,user},ecpg,pg_{config,dump,dumpall,restore},psql,reindexdb,vacuumdb}.1 + + dodoc README HISTORY doc/{README.*,TODO,bug.template} + + dodir /etc/eselect/postgresql/slots/${SLOT} + cat > "${D}/etc/eselect/postgresql/slots/${SLOT}/service" <<-__EOF__ + postgres_ebuilds="\${postgres_ebuilds} ${PF}" + postgres_service="postgresql-${SLOT}" + __EOF__ + + newinitd "${FILESDIR}/postgresql.init-${SLOT}-r1" postgresql-${SLOT} || die "Inserting init.d-file failed" + newconfd "${FILESDIR}/postgresql.conf-${SLOT}-r1" postgresql-${SLOT} || die "Inserting conf.d-file failed" + + keepdir /var/run/postgresql + fperms 0770 /var/run/postgresql + fowners postgres:postgres /var/run/postgresql +} + +pkg_postinst() { + eselect postgresql update + [[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT} + [[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT} + + ewarn "Please note that the standard location of the socket has changed from /tmp to" + ewarn "/var/run/postgresql and you have to be in the 'postgres' group to access the" + ewarn "socket. This can break applications which have the standard location" + ewarn "hard-coded. If such an application links against the libpq, please reemerge" + ewarn "it. If that doesn't help or the application accesses the socket without using" + ewarn "libpq, please file a bug-report." + ewarn + ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the" + ewarn "original location." + ewarn + + elog "Before initializing the database, you may want to edit PG_INITDB_OPTS so that it" + elog "contains your preferred locale and character encoding in:" + elog + elog " /etc/conf.d/postgresql-${SLOT}" + elog + elog "Then, execute the following command to setup the initial database environment:" + elog + elog " emerge --config =${CATEGORY}/${PF}" + elog + elog "The autovacuum function, which was in contrib, has been moved to the main" + elog "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled by" + elog "default. You can disable it in the cluster's postgresql.conf." + elog + elog "The timestamp format is 64 bit integers now. If you upgrade from older" + elog "databases, this may force you to either do a dump and reload or enable" + elog "pg_legacytimestamp until you find time to do so. If the database can't start" + elog "please try enabling pg_legacytimestamp and rebuild." +} + +pkg_postrm() { + eselect postgresql update +} + +pkg_config() { + [[ -f /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT} + [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data" + + # environment.bz2 may not contain the same locale as the current system + # locale. Unset and source from the current system locale. + if [ -f /etc/env.d/02locale ]; then + unset LANG + unset LC_CTYPE + unset LC_NUMERIC + unset LC_TIME + unset LC_COLLATE + unset LC_MONETARY + unset LC_MESSAGES + unset LC_ALL + source /etc/env.d/02locale + [ -n "${LANG}" ] && export LANG + [ -n "${LC_CTYPE}" ] && export LC_CTYPE + [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC + [ -n "${LC_TIME}" ] && export LC_TIME + [ -n "${LC_COLLATE}" ] && export LC_COLLATE + [ -n "${LC_MONETARY}" ] && export LC_MONETARY + [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES + [ -n "${LC_ALL}" ] && export LC_ALL + fi + + einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable." + einfo "More information can be found here:" + einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" + einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html" + einfo "Simply add the options you would have added to initdb to the PG_INITDB_OPTS" + einfo "variable." + einfo + einfo "You can change the directory where the database cluster is being created by" + einfo "setting the PGDATA variable." + einfo + einfo "PG_INITDB_OPTS is currently set to:" + einfo " \"${PG_INITDB_OPTS}\"" + einfo "and the database cluster will be created in:" + einfo " \"${PGDATA}\"" + einfo "Are you ready to continue? (Y/n)" + read answer + [ -z $answer ] && answer=Y + [ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted" + + if [[ -f "${PGDATA}/PG_VERSION" ]] ; then + eerror "The given directory \"${PGDATA}\" already contains a database cluster." + die "cluster already exists" + fi + + [ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128" + einfo "Checking system parameters..." + + if ! use kernel_linux ; then + SKIP_SYSTEM_TESTS=yes + einfo " Tests not supported on this OS (yet)" + fi + + if [ -z ${SKIP_SYSTEM_TESTS} ] ; then + einfo "Checking whether your system supports at least ${PG_MAX_CONNECTIONS} connections..." + + local SEMMSL=$(sysctl -n kernel.sem | cut -f1) + local SEMMNS=$(sysctl -n kernel.sem | cut -f2) + local SEMMNI=$(sysctl -n kernel.sem | cut -f4) + local SHMMAX=$(sysctl -n kernel.shmmax) + + local SEMMSL_MIN=17 + local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 )) + local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 )) + local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) )) + + for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do + if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then + eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)" + eerror "You have now several options:" + eerror " - Change the mentioned system parameter" + eerror " - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}" + eerror " - Set SKIP_SYSTEM_TESTS in case you want to ignore this test completely" + eerror "More information can be found here:" + eerror " http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html" + die "System test failed." + fi + done + einfo "Passed." + else + einfo "Skipped." + fi + + einfo "Creating the data directory ..." + mkdir -p "${PGDATA}" + chown -Rf postgres:postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + + einfo "Initializing the database ..." + + su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}" + + einfo + einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "instead of 'pg_ctl'." + einfo +} + +src_test() { + einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" + PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \ + emake -j1 check || die "Make check failed. See above for details." + + einfo "Yes, there are other tests which could be run." + einfo "... and no, we don't plan to add/support them." + einfo "For now, the main regressions tests will suffice. If you think other tests are" + einfo "necessary, please submit a bug including a patch for this ebuild to enable them." +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-java/maven-bin/maven-bin-3.0.3.ebuild Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,49 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-3.0.2.ebuild,v 1.1 2011/01/15 12:25:40 fordfrog Exp $ + +inherit java-pkg-2 + +MY_PN=apache-${PN%%-bin} +MY_P="${MY_PN}-${PV}" + +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 + chmod 644 "${S}"/boot/*.jar "${S}"/lib/*.jar "${S}"/conf/settings.xml || 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} + + # bug #342901 + echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die + doenvd "${T}/25${MAVEN}" +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-libs/ossp-uuid/Manifest Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,3 @@ +AUX ossp-uuid-1.6.2-gentoo.patch 4777 RMD160 ce76189a2bcb1d4b1e9293a6c1be39ce6327d4b3 SHA1 0a64f4b85b9c3433ec5ae09aede129040cca4771 SHA256 4b51299cab73dec10500b2114a5993532a6358686c643d5ae9b9d7e7ff0e211c +DIST uuid-1.6.2.tar.gz 397048 RMD160 f9cd513577557c4f1d7de869f80035b8844b56d7 SHA1 3e22126f0842073f4ea6a50b1f59dcb9d094719f SHA256 11a615225baa5f8bb686824423f50e4427acd3f70d394765bdff32801f0fd5b0 +EBUILD ossp-uuid-1.6.2.ebuild 1608 RMD160 0d3b4385d25df82923d5f4560a3919eefd6eaaa0 SHA1 a4c216b02e1be39d618a44d7dfd14df2e5372572 SHA256 931712a9d9ce2dbcef56d3fe94bf2d419afd8de0f7e8768088779ab85b6b8db0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-libs/ossp-uuid/files/ossp-uuid-1.6.2-gentoo.patch Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,113 @@ +diff -Naur uuid-1.6.2.orig/Makefile.in uuid-1.6.2/Makefile.in +--- uuid-1.6.2.orig/Makefile.in 2009-03-21 12:52:49.142847389 +0100 ++++ uuid-1.6.2/Makefile.in 2009-03-21 12:53:54.201971177 +0100 +@@ -62,13 +62,13 @@ + PHP = @PHP@ + PG_CONFIG = @PG_CONFIG@ + +-LIB_NAME = libuuid.la ++LIB_NAME = libossp-uuid.la + LIB_OBJS = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo + +-DCE_NAME = libuuid_dce.la ++DCE_NAME = libossp-uuid_dce.la + DCE_OBJS = uuid_dce.lo $(LIB_OBJS) + +-CXX_NAME = libuuid++.la ++CXX_NAME = libossp-uuid++.la + CXX_OBJS = uuid++.lo $(LIB_OBJS) + + PRG_NAME = uuid +@@ -112,15 +112,15 @@ + @$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< + + $(LIB_NAME): $(LIB_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(DCE_NAME): $(DCE_OBJS) +- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(CXX_NAME): $(CXX_OBJS) +- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ ++ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \ + -version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h` + + $(PRG_NAME): $(PRG_OBJS) $(LIB_NAME) +@@ -253,7 +253,7 @@ + -@if [ ".$(WITH_CXX)" = .yes ]; then \ + $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(CXX_NAME) $(DESTDIR)$(libdir)/; \ + fi +- @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/ ++ @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 755 uuid $(DESTDIR)$(bindir)/ + $(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/ + -@if [ ".$(WITH_PERL)" = .yes ]; then \ + (cd $(S)/perl && $(MAKE) $(MFLAGS) install DESTDIR=$(DESTDIR)); \ +diff -Naur uuid-1.6.2.orig/php/config.m4 uuid-1.6.2/php/config.m4 +--- uuid-1.6.2.orig/php/config.m4 2009-03-21 12:52:49.142847389 +0100 ++++ uuid-1.6.2/php/config.m4 2009-03-21 12:53:06.282809038 +0100 +@@ -33,10 +33,10 @@ + if test "$PHP_UUID" != "no"; then + PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared) + AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library]) +- PHP_ADD_LIBPATH([..], ) +- PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD) ++ PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD) + PHP_ADD_INCLUDE([..]) + PHP_SUBST(UUID_SHARED_LIBADD) ++ LDFLAGS="$LDFLAGS -L../.libs" + + dnl avoid linking conflict with a potentially existing uuid_create(3) in libc + AC_CHECK_FUNC(uuid_create,[ +diff -Naur uuid-1.6.2.orig/php/Makefile.local uuid-1.6.2/php/Makefile.local +--- uuid-1.6.2.orig/php/Makefile.local 2009-03-21 12:52:49.142847389 +0100 ++++ uuid-1.6.2/php/Makefile.local 2009-03-21 12:53:06.282809038 +0100 +@@ -42,7 +42,7 @@ + + test: build + @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; \ +- $(PHP) -q -d "safe_mode=0" -d "extension_dir=./" uuid.ts $$version ++ $(PHP) -q -d "safe_mode=0" -d "extension_dir=./modules/" uuid.ts $$version + + install: build + @version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \ +diff -Naur uuid-1.6.2.orig/php/uuid.ts uuid-1.6.2/php/uuid.ts +--- uuid-1.6.2.orig/php/uuid.ts 2009-03-21 12:52:49.142847389 +0100 ++++ uuid-1.6.2/php/uuid.ts 2009-03-21 12:53:06.282809038 +0100 +@@ -36,7 +36,7 @@ + + print "++ loading DSO uuid.so (low-level API)\n"; + if (!extension_loaded('uuid')) { +- dl('modules/uuid.so'); ++ dl('uuid.so'); + } + + print "++ loading PHP uuid.php${php_version} (high-level API)\n"; +diff -Naur uuid-1.6.2.orig/uuid-config.in uuid-1.6.2/uuid-config.in +--- uuid-1.6.2.orig/uuid-config.in 2009-03-21 12:52:49.146166177 +0100 ++++ uuid-1.6.2/uuid-config.in 2009-03-21 12:53:06.282809038 +0100 +@@ -121,7 +121,7 @@ + output_extra="$output_extra $uuid_ldflags" + ;; + --libs) +- output="$output -luuid" ++ output="$output -lossp-uuid" + output_extra="$output_extra $uuid_libs" + ;; + * ) +diff -Naur uuid-1.6.2.orig/uuid.pc.in uuid-1.6.2/uuid.pc.in +--- uuid-1.6.2.orig/uuid.pc.in 2009-03-21 12:52:49.146166177 +0100 ++++ uuid-1.6.2/uuid.pc.in 2009-03-21 12:53:06.282809038 +0100 +@@ -36,7 +36,7 @@ + Description: Universally Unique Identifier (UUID) Library + Version: @UUID_VERSION_RAW@ + URL: http://www.ossp.org/pkg/lib/uuid/ +-Cflags: -I${includedir} +-Libs: -L${libdir} -luuid ++Cflags: -I${includedir}/ossp ++Libs: -L${libdir} -lossp-uuid + Libs.private: @LIBS@ +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2.ebuild Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,60 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2.ebuild,v 1.8 2010/04/25 20:14:06 armin76 Exp $ + +EAPI="2" + +inherit eutils multilib + +MY_P="uuid-${PV}" + +DESCRIPTION="An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID." +HOMEPAGE="http://www.ossp.org/pkg/lib/uuid/" +SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz" +LICENSE="as-is" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="+cxx" + +DEPEND="" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-gentoo.patch" +} + +src_compile() { + # Notes: + # * collides with e2fstools libs and includes if not moved around + # * perl-bindings are broken + # * pgsql-bindings need PostgreSQL-sources and are included since PostgreSQL 8.3 + econf \ + --includedir=/usr/include/ossp \ + --with-dce \ + --without-pgsql \ + --without-perl \ + --without-php \ + $(use_with cxx) \ + || die "econf failed" + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS BINDINGS ChangeLog HISTORY NEWS OVERVIEW PORTING README SEEALSO THANKS TODO USERS + + mv "${D}/usr/$(get_libdir)/pkgconfig"/{,ossp-}uuid.pc + mv "${D}/usr/share/man/man3"/uuid.3{,ossp} + mv "${D}/usr/share/man/man3"/uuid++.3{,ossp} +} + +src_test() { + emake check || die "emake check failed" + # Tests for the php-bindings would be available +}
--- a/mail-filter/imapfilter/Manifest Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -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
--- a/mail-filter/imapfilter/imapfilter-2.2.2.ebuild Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# 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" -}
--- a/net-analyzer/mrtg/Manifest Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -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
--- a/net-analyzer/mrtg/files/mrtg.confd Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -# 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=""
--- a/net-analyzer/mrtg/files/mrtg.rc Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -#!/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" -}
--- a/net-analyzer/mrtg/metadata.xml Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -<?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>
--- a/net-analyzer/mrtg/mrtg-2.16.4.ebuild Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -# 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 Fri Apr 01 17:52:02 2011 +0200 +++ b/net-misc/rabbitmq-server/Manifest Fri Apr 01 17:58:34 2011 +0200 @@ -1,3 +1,5 @@ -AUX rabbitmq-server.init 434 RMD160 11a7851c395e488bb03a7a002d62dae405d4f67f SHA1 c1030740427f95eedba3fafbb8a038ea69842607 SHA256 d3f8fb55bbab4506567a9dbc995194720ed63072c82af27bbb6831541a0fb89c -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 +AUX rabbitmq-script-wrapper 1844 RMD160 255586b0339a8200c63309eaefb952f67712eb0d SHA1 3b4f880d484541e749e3dd0d913adc6a21e4df23 SHA256 46783bc7466f48d8ddc785c5aac2b94d723c811106b6d8251adee170558f316e +AUX rabbitmq-server.init-r1 640 RMD160 74285fbafeeec24b3c9f5e83ec0f65bed9e23a06 SHA1 c68b9493920a25dbad9ad27e462defbff775c582 SHA256 5c4110c077679461105d77f1b1048bf014f6f4a817e402a1f6bc0d93feaa1ae4 +DIST rabbitmq-server-2.4.0.tar.gz 318182 RMD160 6362f4f2bf06f201410132be91edbd64a1577798 SHA1 9f39d830aa778cf8e71fd5eb47c8a42e26c3c42d SHA256 aadad1bb6ae8b7ecba73dbe1c74a2dfd3ac0559018ed0d433af1df9938f67e7f +EBUILD rabbitmq-server-2.4.0.ebuild 2237 RMD160 6afbe2bdea6a454580b6a13b55c73e0b7cea2296 SHA1 a490ffcacdfac87fdd1e50f9c83bf749bad29bc5 SHA256 5b9f6b8b7fe38e8a21578b72922c3d79de01d7d8270fab220ffc212d699a66dd +MISC metadata.xml 256 RMD160 d9b3d76f0f3b12500bf0a1e012563f2f32f4992f SHA1 2520f467b4a64d131a92dd8101e03ad334d6d7a6 SHA256 74f2c9d6b7ef600697deed6d19bc64604a39ba7a2e8c24fae47ca2544def84c0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/files/rabbitmq-script-wrapper Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,53 @@ +#!/bin/sh +## The contents of this file are subject to the Mozilla Public License +## Version 1.1 (the "License"); you may not use this file except in +## compliance with the License. You may obtain a copy of the License at +## http://www.mozilla.org/MPL/ +## +## Software distributed under the License is distributed on an "AS IS" +## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +## License for the specific language governing rights and limitations +## under the License. +## +## The Original Code is RabbitMQ. +## +## The Initial Developers of the Original Code are LShift Ltd, +## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. +## +## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, +## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd +## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial +## Technologies LLC, and Rabbit Technologies Ltd. +## +## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift +## Ltd. Portions created by Cohesive Financial Technologies LLC are +## Copyright (C) 2007-2009 Cohesive Financial Technologies +## LLC. Portions created by Rabbit Technologies Ltd are Copyright +## (C) 2007-2009 Rabbit Technologies Ltd. +## +## All Rights Reserved. +## +## Contributor(s): ______________________________________. +## + +# Escape spaces and quotes, because shell is revolting. +for arg in "$@" ; do + # Escape quotes in parameters, so that they're passed through cleanly. + arg=$(sed -e 's/"/\\"/g' <<-END + $arg + END + ) + CMDLINE="${CMDLINE} \"${arg}\"" +done + +cd /var/lib/rabbitmq + +SCRIPT=`basename $0` + +if [ `id -u` = 0 ] ; then + su rabbitmq -s /bin/sh -c "/usr/libexec/rabbitmq/${SCRIPT} ${CMDLINE}" +else + /usr/libexec/rabbitmq/${SCRIPT} + echo -e "\nOnly root should run ${SCRIPT}\n" + exit 1 +fi
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -#!/sbin/runscript -# 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/files/rabbitmq-server.init,v 1.1 2009/04/19 12:42:55 caleb Exp $ - -depend() { - need net - use dns -} - -start() { - ebegin "Starting RabbitMQ..." - rabbitmq-server -detached - eend $? -} - -stop() { - ebegin "Stopping RabbitMQ..." - rabbitmqctl stop - eend $? -} -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r1 Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,22 @@ +#!/sbin/runscript +# 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/files/rabbitmq-server.init-r1,v 1.1 2010/08/28 14:33:02 hollow Exp $ + +depend() { + need epmd + need net + use dns +} + +start() { + ebegin "Starting RabbitMQ..." + start-stop-daemon --start --background --exec /usr/sbin/rabbitmq-server >> /var/log/rabbitmq/startup.log 2>> /var/log/rabbitmq/startup.err + eend $? +} + +stop() { + ebegin "Stopping RabbitMQ..." + /usr/sbin/rabbitmqctl stop >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err + eend $? +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/metadata.xml Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>no-herd</herd> + <maintainer> + <email>hollow@gentoo.org</email> + <name>Benedikt Böhm</name> + </maintainer> +</pkgmetadata> +
--- a/net-misc/rabbitmq-server/rabbitmq-server-1.8.1.ebuild Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -# 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 -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-misc/rabbitmq-server/rabbitmq-server-2.4.0.ebuild Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,83 @@ +# 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-2.1.0.ebuild,v 1.1 2010/09/19 08:35:51 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} + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + dev-libs/libxslt + dev-python/simplejson +" + +pkg_setup() { + enewgroup rabbitmq + enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq +} + +src_compile() { + emake all docs_all || die "emake all failed" + gunzip docs/*.gz +} + +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 modules to ${targetdir}" + insinto "${targetdir}" + doins -r ebin include + + einfo "Installing server scripts to /usr/sbin" + for script in rabbitmq-env rabbitmq-server rabbitmqctl; do + exeinto /usr/libexec/rabbitmq + doexe scripts/${script} + newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script} + done + + # 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-r1 rabbitmq + + # install documentation + doman docs/*.[15] + dodoc README +} + +pkg_preinst() { + if has_version "<=net-misc/rabbitmq-server-1.8.0"; then + elog "IMPORTANT UPGRADE NOTICE:" + elog + elog "RabbitMQ is now running as an unprivileged user instead of root." + elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database." + elog "Please run the following commands as root:" + elog + elog " usermod -d /var/lib/rabbitmq rabbitmq" + elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq" + elog + fi +}
--- a/net-proxy/squid/Manifest Fri Apr 01 17:52:02 2011 +0200 +++ b/net-proxy/squid/Manifest Fri Apr 01 17:58:34 2011 +0200 @@ -1,14 +1,9 @@ -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-3.1.10-gentoo.patch 10181 RMD160 ef5afec1b300984db7383648dd994dbeb80d88fc SHA1 b09b70f569df1f4171802d635f57d9b5f9718e5e SHA256 4ffacf14d12f316073ef3e36f0ff530eb83b5748898535699011a04e7f57e427 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.5.tar.gz 3226676 RMD160 b5153ae6cbce267e62537bcaa1694091b142c727 SHA1 94eaa4a1aa7483af64ca04b1715204cfb4a01ee8 SHA256 93e0e5e3a8fc7ac991d34b69bbfbb7c48540df44b1a606a89304d1742c8d1bf7 -EBUILD squid-3.1.5.ebuild 6848 RMD160 af8daf348caa6d618fcaa9368abcbf1af00eafea SHA1 3a0ba070d66d0f50b028d900befc032b3e52decc SHA256 754f2a22bde73a836ce20d45b0c6deea4b752580c6252f9594320b549f3935c6 +DIST squid-3.1.10.tar.gz 3348337 RMD160 06b8569e821ba8d34f00d2cd488baf9be0b4f178 SHA1 2aec08938510e4161c07e8523eed04f8a51d8bc9 SHA256 f069b206e64d5f8b193436d6360aeb4874a70d6697fb0152126b158fccb4852e +EBUILD squid-3.1.10.ebuild 6937 RMD160 26b15c81e07fd8759216d72d8c757377f76517aa SHA1 d27d84691c13a402207281cefc20d4489365e114 SHA256 c11bb0b6fba9ca7b3ddcc52c592f8e33619b45af61e5b9f5c0cf93b4408d3aae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/files/squid-3.1.10-gentoo.patch Fri Apr 01 17:58:34 2011 +0200 @@ -0,0 +1,231 @@ +diff -Nru squid-3.1.10.orig/acinclude.m4 squid-3.1.10/acinclude.m4 +--- squid-3.1.10.orig/acinclude.m4 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/acinclude.m4 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.10/helpers/basic_auth/MSNT/confload.c +--- squid-3.1.10.orig/helpers/basic_auth/MSNT/confload.c 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/helpers/basic_auth/MSNT/confload.c 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.10/helpers/basic_auth/MSNT/msntauth.conf.default +--- squid-3.1.10.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/helpers/basic_auth/MSNT/msntauth.conf.default 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.10/helpers/basic_auth/SMB/Makefile.am +--- squid-3.1.10.orig/helpers/basic_auth/SMB/Makefile.am 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/helpers/basic_auth/SMB/Makefile.am 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.10/helpers/basic_auth/SMB/smb_auth.sh +--- squid-3.1.10.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/helpers/basic_auth/SMB/smb_auth.sh 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/helpers/external_acl/session/squid_session.8 squid-3.1.10/helpers/external_acl/session/squid_session.8 +--- squid-3.1.10.orig/helpers/external_acl/session/squid_session.8 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/helpers/external_acl/session/squid_session.8 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.10/helpers/external_acl/unix_group/squid_unix_group.8 +--- squid-3.1.10.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-09-04 05:25:58.000000000 +0200 ++++ squid-3.1.10/helpers/external_acl/unix_group/squid_unix_group.8 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/lib/libTrie/acinclude.m4 squid-3.1.10/lib/libTrie/acinclude.m4 +--- squid-3.1.10.orig/lib/libTrie/acinclude.m4 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/lib/libTrie/acinclude.m4 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/src/cf.data.pre squid-3.1.10/src/cf.data.pre +--- squid-3.1.10.orig/src/cf.data.pre 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/src/cf.data.pre 2010-09-23 23:34:10.000000000 +0200 +@@ -716,6 +716,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 +@@ -864,6 +865,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 +@@ -6357,7 +6361,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.10.orig/src/debug.cc squid-3.1.10/src/debug.cc +--- squid-3.1.10.orig/src/debug.cc 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/src/debug.cc 2010-09-23 23:34:10.000000000 +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 -Nru squid-3.1.10.orig/src/main.cc squid-3.1.10/src/main.cc +--- squid-3.1.10.orig/src/main.cc 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/src/main.cc 2010-09-23 23:34:10.000000000 +0200 +@@ -1556,7 +1556,7 @@ + if (*(argv[0]) == '(') + return; + +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); + + if ((pid = fork()) < 0) + syslog(LOG_ALERT, "fork failed: %s", xstrerror()); +@@ -1600,7 +1600,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_DAEMON); + prog = xstrdup(argv[0]); + argv[0] = xstrdup("(squid)"); + execvp(prog, argv); +@@ -1608,7 +1608,7 @@ + } + + /* parent */ +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); + + syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); + +diff -Nru squid-3.1.10.orig/src/Makefile.am squid-3.1.10/src/Makefile.am +--- squid-3.1.10.orig/src/Makefile.am 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.10/src/Makefile.am 2010-09-23 23:34:10.000000000 +0200 +@@ -638,7 +638,6 @@ + + sysconf_DATA = \ + squid.conf.default \ +- squid.conf.documented \ + mime.conf.default + + data_DATA = \ +@@ -719,8 +718,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)` +
--- a/net-proxy/squid/files/squid-3.1.5-errorstate-leak-fix.patch Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ ---- 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);
--- a/net-proxy/squid/files/squid-3.1.5-gentoo.patch Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,281 +0,0 @@ -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)` -
--- a/net-proxy/squid/files/squid-3.1.5-libmd5.patch Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -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
--- a/net-proxy/squid/files/squid-3.1.5-qafixes.patch Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -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);
--- a/net-proxy/squid/files/squid-3.1.5-range-leak-fix-1.patch Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -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(); - } -
--- a/net-proxy/squid/files/squid-3.1.5-range-leak-fix-2.patch Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ ---- 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))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/net-proxy/squid/squid-3.1.10.ebuild Fri Apr 01 17:58:34 2011 +0200 @@ -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/net-proxy/squid/squid-3.1.8.ebuild,v 1.9 2010/10/09 16:31:59 armin76 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 tproxy" +RESTRICT=test + +COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) + pam? ( virtual/pam ) + ldap? ( net-nds/openldap ) + kerberos? ( virtual/krb5 ) + 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 + sys-apps/ed + 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 )" + +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 + + if use tproxy && ! use caps; then + eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!" + eerror "Please enable caps USE flag and try again." + + die "invalid combination of USE flags" + fi + + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.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 tproxy linux-tproxy) + $(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 +}
--- a/net-proxy/squid/squid-3.1.5.ebuild Fri Apr 01 17:52:02 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,221 +0,0 @@ -# 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 -}