old

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 7 insertions, 237 deletions

diff --git a/www-apache/mod_vhost_ldap/ChangeLog b/www-apache/mod_vhost_ldap/ChangeLog
index 988248d7ebbc..9d5986a35c4a 100644
--- a/www-apache/mod_vhost_ldap/ChangeLog
+++ b/www-apache/mod_vhost_ldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apache/mod_vhost_ldap
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/ChangeLog,v 1.12 2014/12/18 02:11:23 mjo Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/ChangeLog,v 1.13 2015/04/04 06:13:57 mr_bones_ Exp $
+
+  04 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/mod_vhost_ldap-1.0.0-apache22.patch, -mod_vhost_ldap-1.0.0-r1.ebuild:
+  old
 
 *mod_vhost_ldap-2.4.0 (18 Dec 2014)
 
diff --git a/www-apache/mod_vhost_ldap/Manifest b/www-apache/mod_vhost_ldap/Manifest
index e8345566c619..ae632131869e 100644
--- a/www-apache/mod_vhost_ldap/Manifest
+++ b/www-apache/mod_vhost_ldap/Manifest
@@ -1,30 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 99_mod_vhost_ldap.conf 274 SHA256 78d719363e3be8f17e83ef3af56fc5fb58e25a13d28e60c78ccddbcfee66fd46 SHA512 597fe675c63118477d8883cc53a7c21c287c0a6446392b2b96243256ebc0a9e30f758b0af5254d0be10cce91aea04bfe030cd6d8793121bebee2c445964e9885 WHIRLPOOL 94fb37d39e818296e26b1ed034cfdc52d1ec79b247ad6d8aa673bb65649dab1ccfcec3db379d273bf0c12d65a8d3e05e240bfa58d988989a8918e44237518f2d
-AUX mod_vhost_ldap-1.0.0-apache22.patch 6251 SHA256 3a921212c905a5e2139ecf9f2c5a05a985a8e4af83b8730fa05b04b174a052c2 SHA512 01f4b5744d4a86ca21c4a81f1897d09c522b2c8fd2fc6511b3cb3156ef84e529c91e960c9824268a4a97b49e837791e758dd8262a5d827e5e7f56ffb699882d5 WHIRLPOOL 5da5e8120658927e5f7c9b0c8628dbdb5bd854f9a28f04d4880c2ce9ec5eed73c162c8af3f176e3d81b95a13c94fe6bc9994f20c28a95fa87ff0407cb41cc08b
-DIST mod_vhost_ldap-1.0.0.tar.bz2 7862 SHA256 e14713d736e79ca7760b8ca8bd32fd01e97ef0f14396bdea9373d7bfd8dd1f87
 DIST mod_vhost_ldap-2.4.0.tar.xz 9628 SHA256 5f4394bb3b6ad8c1e380ef5a7ee3a45e8310d83beea98f228ca022f196e039d3 SHA512 b9715881ca704207fd852dfa2370dd71993bc85f390b353201aaf40c4252978e720abeda8b29b6c676f3cac66e50b67989825d7a6d3992829fbbfed725c75330 WHIRLPOOL 05dc93d086fbc90e95903dda3ec9b81ec2255667455cd09cf6fb96b3bb4e6e55a6da97f290b73f298242338e91dc378347dfea0b9e9d8d5ba493f90c2c0d2bf5
-EBUILD mod_vhost_ldap-1.0.0-r1.ebuild 1293 SHA256 35dd3f27b46220c6b217113394309d561a621fadc0f492749f6c23f80306c953 SHA512 2643a7191a7e4f74cdc283ff1e4aa3a68b20d18661bc2320f9f25e293261526927164ddcd27298a9343a54c7a9c329fab17a2566ffa02824a95676cc5c6fb2e9 WHIRLPOOL 465cc0241ecb7e089297d837de77468870899360ae2e85075eeaf31d2b1cdab98ff596e705c6bbe992f8ee8084b6bd37df365509e2bd6fb75b7ba54b9f067863
 EBUILD mod_vhost_ldap-2.4.0.ebuild 1170 SHA256 510dafda61dd2710dc8a03eb64334857237d007d50be71f7a1d70c1624a13590 SHA512 2aaba85eee849b580f483fed09a5fa3b17b9f4296dc4a279d4d58b97ab95fbaf630b5e46f25edcf07be09f7705ffb216cd917fc9711a1c93920120d453698266 WHIRLPOOL 230b97fc7be8550c0b1ed84d5a186f1d740a6d7f99d0cf1c1bc8f720a31bf94c8b22f2e1df1b539ecb4f9f6f8c7bf5c3adc210b265366f74d77e4d662ef02fe1
-MISC ChangeLog 2102 SHA256 2c336e5c16948e0eb5d01ad8ae36b8b99ba2cf18b848d66a123821861c1ae819 SHA512 ff8084532c8d80684bf9c4f178db9b7141220edee394b7fa0b93eb20e5c7ab0610782c19fc65cc4405ecd81f35110d712a46d27fe46d47018c18cc835b5da52f WHIRLPOOL f298fabcfb6529cf3b3f4fd06d05359acdd59b55b3e05e6b3390a1220ec72bfa1b6c908c5dd3191dcdff793b8f3fb50c37389645530fa858ccd3338e0610a608
+MISC ChangeLog 2249 SHA256 54f52b4c848cfb7458588f73cc80c5f2febc2a1ce566ee28a06f4b1eed9842f8 SHA512 c87ceee59a429bcf43a83a1c39eb047e39d015f16041f08dd3ac4845a04216743a53dc26eb86ad7c51296afb87465f313a2724898bf1187a442bcb916cbf09d6 WHIRLPOOL 729108282a6ee68bacdd23f0e0d13b5c51ade176b8d528388db96b29dd60ac50377f5eed074c00469d25c9472976fb7c3a330c136813c0eae2de1bdc3c11ec9e
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCABmBQJUkjfPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbqT8P/0AGBHMXYxkSfjIU7SViOsJo
-MnIThdp84XKP3bTF9mEbOxFlb56+GkN4UfUppe7cUZPOBeZYKGhX8xtVPhERwbiX
-k1F2vrerRiOMdILBOUZUEFXzzdj9hwymrZtQyA/OWsdU2zo9wGyTqMOR0PgWyFIu
-CGx/Uy+NyQDRc5QHoPeb8B6vqCD/d2d3OTDBmhYyVdOtOQR4HWIuG4TDgGtZeG5O
-m401EzQK7AR1++/mAtSZ4a5eXwK3Hvdlne1d1OT/GtFqtMt1CoVE9Lv5tQYc033a
-foGc0dZH2GqL7/RPa6RIWDZ9CzSq8c+eR1GGDfdEC20T1BnRE2byudRepdpRTO1Q
-6IahmaloWKCsEjXSl/PW+buEEdhkywgg21lenbVl6uglM8itPxUs0Uw8ey1WohEu
-PuFvgYVr+3ZRDRRojW69YJHSSd3LH7N5uTXSZwXFj5MOC9jE7rBOv97KbUbD1w/7
-MZFFbaKuH1GzKUFkgVvG7CzGLp8c2NV2Kzok4v3RdmrBbkG8cGiybJhNN19QGayZ
-k3Vnn8NC7y+8o0az4pB+DQgqCDhaqhhDTuZCDtembevZxuxfNTeyX+PuJFKnJqoG
-GCrgmdUX6HbKEe0XBFoWtar4JiYNrW1x/ii02ljnx/zn0DgZCQ/B07C7Pc3tMhrQ
-t1BvV69BjjXZSiOz2yaC
-=TRu7
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_vhost_ldap/files/mod_vhost_ldap-1.0.0-apache22.patch b/www-apache/mod_vhost_ldap/files/mod_vhost_ldap-1.0.0-apache22.patch
deleted file mode 100644
index 484328f14b67..000000000000
--- a/www-apache/mod_vhost_ldap/files/mod_vhost_ldap-1.0.0-apache22.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Index: mod-vhost-ldap-1.0.0/mod_vhost_ldap.c
-===================================================================
---- mod-vhost-ldap-1.0.0.orig/mod_vhost_ldap.c
-+++ mod-vhost-ldap-1.0.0/mod_vhost_ldap.c
-@@ -29,12 +29,13 @@
- #include "http_core.h"
- #include "http_log.h"
- #include "http_request.h"
-+#include "apr_version.h"
- #include "apr_ldap.h"
- #include "apr_strings.h"
- #include "apr_reslist.h"
- #include "util_ldap.h"
- 
--#ifndef APU_HAS_LDAP
-+#if !defined(APU_HAS_LDAP) && !defined(APR_HAS_LDAP)
- #error mod_vhost_ldap requires APR-util to have LDAP support built in
- #endif
- 
-@@ -93,6 +94,27 @@ typedef struct mod_vhost_ldap_request_t 
- char *attributes[] =
-   { "apacheServerName", "apacheDocumentRoot", "apacheScriptAlias", "apacheSuexecUid", "apacheSuexecGid", "apacheServerAdmin", 0 };
- 
-+#if (APR_MAJOR_VERSION >= 1)
-+static APR_OPTIONAL_FN_TYPE(uldap_connection_close) *util_ldap_connection_close;
-+static APR_OPTIONAL_FN_TYPE(uldap_connection_find) *util_ldap_connection_find;
-+static APR_OPTIONAL_FN_TYPE(uldap_cache_comparedn) *util_ldap_cache_comparedn;
-+static APR_OPTIONAL_FN_TYPE(uldap_cache_compare) *util_ldap_cache_compare;
-+static APR_OPTIONAL_FN_TYPE(uldap_cache_checkuserid) *util_ldap_cache_checkuserid;
-+static APR_OPTIONAL_FN_TYPE(uldap_cache_getuserdn) *util_ldap_cache_getuserdn;
-+static APR_OPTIONAL_FN_TYPE(uldap_ssl_supported) *util_ldap_ssl_supported;
-+
-+static void ImportULDAPOptFn(void)
-+{
-+    util_ldap_connection_close  = APR_RETRIEVE_OPTIONAL_FN(uldap_connection_close);
-+    util_ldap_connection_find   = APR_RETRIEVE_OPTIONAL_FN(uldap_connection_find);
-+    util_ldap_cache_comparedn   = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_comparedn);
-+    util_ldap_cache_compare     = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_compare);
-+    util_ldap_cache_checkuserid = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_checkuserid);
-+    util_ldap_cache_getuserdn   = APR_RETRIEVE_OPTIONAL_FN(uldap_cache_getuserdn);
-+    util_ldap_ssl_supported     = APR_RETRIEVE_OPTIONAL_FN(uldap_ssl_supported);
-+}
-+#endif 
-+
- static int mod_vhost_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
- {
-     /* make sure that mod_ldap (util_ldap) is loaded */
-@@ -114,6 +136,7 @@ mod_vhost_ldap_create_server_config (apr
- {
-     mod_vhost_ldap_config_t *conf =
- 	(mod_vhost_ldap_config_t *)apr_pcalloc(p, sizeof (mod_vhost_ldap_config_t));
-+    memset(conf, 0, sizeof(mod_vhost_ldap_config_t));
- 
-     conf->enabled = MVL_UNSET;
-     conf->have_ldap_url = 0;
-@@ -133,6 +156,7 @@ mod_vhost_ldap_merge_server_config(apr_p
-     mod_vhost_ldap_config_t *child  = (mod_vhost_ldap_config_t *) childv;
-     mod_vhost_ldap_config_t *conf =
- 	(mod_vhost_ldap_config_t *)apr_pcalloc(p, sizeof(mod_vhost_ldap_config_t));
-+    memset(conf, 0, sizeof(mod_vhost_ldap_config_t));
- 
-     if (child->enabled == MVL_UNSET) {
- 	conf->enabled = parent->enabled;
-@@ -185,6 +209,9 @@ static const char *mod_vhost_ldap_parse_
- {
-     int result;
-     apr_ldap_url_desc_t *urld;
-+#if (APR_MAJOR_VERSION >= 1)
-+    apr_ldap_err_t *result_err;
-+#endif
- 
-     mod_vhost_ldap_config_t *conf =
- 	(mod_vhost_ldap_config_t *)ap_get_module_config(cmd->server->module_config,
-@@ -193,22 +220,29 @@ static const char *mod_vhost_ldap_parse_
-     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0,
- 	         cmd->server, "[mod_vhost_ldap.c] url parse: `%s'", 
- 	         url);
--
-+    
-+#if (APR_MAJOR_VERSION >= 1)    /* for apache >= 2.2 */
-+    result = apr_ldap_url_parse(cmd->pool, url, &(urld), &(result_err));
-+    if (result != LDAP_SUCCESS) {
-+        return result_err->reason;
-+    }
-+#else
-     result = apr_ldap_url_parse(url, &(urld));
-     if (result != LDAP_SUCCESS) {
-         switch (result) {
--        case LDAP_URL_ERR_NOTLDAP:
--            return "LDAP URL does not begin with ldap://";
--        case LDAP_URL_ERR_NODN:
--            return "LDAP URL does not have a DN";
--        case LDAP_URL_ERR_BADSCOPE:
--            return "LDAP URL has an invalid scope";
--        case LDAP_URL_ERR_MEM:
--            return "Out of memory parsing LDAP URL";
--        default:
--            return "Could not parse LDAP URL";
-+            case LDAP_URL_ERR_NOTLDAP:
-+                return "LDAP URL does not begin with ldap://";
-+            case LDAP_URL_ERR_NODN:
-+                return "LDAP URL does not have a DN";
-+            case LDAP_URL_ERR_BADSCOPE:
-+                return "LDAP URL has an invalid scope";
-+            case LDAP_URL_ERR_MEM:
-+                return "Out of memory parsing LDAP URL";
-+            default:
-+                return "Could not parse LDAP URL";
-         }
-     }
-+#endif
-     conf->url = apr_pstrdup(cmd->pool, url);
- 
-     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0,
-@@ -278,7 +312,9 @@ static const char *mod_vhost_ldap_parse_
-     }
- 
-     conf->have_ldap_url = 1;
-+#if (APR_MAJOR_VERSION < 1) /* free only required for older apr */
-     apr_ldap_free_urldesc(urld);
-+#endif
-     return NULL;
- }
- 
-@@ -406,6 +442,7 @@ static int mod_vhost_ldap_translate_name
- 
-     reqc =
- 	(mod_vhost_ldap_request_t *)apr_pcalloc(r->pool, sizeof(mod_vhost_ldap_request_t));
-+    memset(reqc, 0, sizeof(mod_vhost_ldap_request_t)); 
- 
-     ap_set_module_config(r->request_config, &vhost_ldap_module, reqc);
- 
-@@ -608,6 +645,9 @@ mod_vhost_ldap_register_hooks (apr_pool_
- #ifdef HAVE_UNIX_SUEXEC
-     ap_hook_get_suexec_identity(mod_vhost_ldap_get_suexec_id_doer, NULL, NULL, APR_HOOK_MIDDLE);
- #endif
-+#if (APR_MAJOR_VERSION >= 1)
-+    ap_hook_optional_fn_retrieve(ImportULDAPOptFn,NULL,NULL,APR_HOOK_MIDDLE);
-+#endif
- }
- 
- module AP_MODULE_DECLARE_DATA vhost_ldap_module = {
-Index: mod-vhost-ldap-1.0.0/ChangeLog
-===================================================================
---- mod-vhost-ldap-1.0.0.orig/ChangeLog
-+++ mod-vhost-ldap-1.0.0/ChangeLog
-@@ -1,3 +1,11 @@
-+2006-04-21 Bart Vanbrabant <bart.vanbrabant@zoeloelip.be>
-+	* VERSION: 1.0.1 release
-+	* mod_vhost_ldap.c: add support for apache-2.2.x
-+
-+2006-01-30 Ondřej Surý <ondrej@sury.org>
-+	* VERSION: 1.0.0 release
-+	* Fix small memory leak when used in subrequest (e.g. fastcgi)
-+	
- 2005-10-03 Ondřej Surý <ondrej@sury.org>
- 	* mod_vhost_ldap.c: add support for running from subrequest (ie. mod_fastcgi)
- 	* VERSION: 0.2.9 release
diff --git a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild b/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild
deleted file mode 100644
index 9169ca6e7df0..000000000000
--- a/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_vhost_ldap/mod_vhost_ldap-1.0.0-r1.ebuild,v 1.5 2014/08/10 20:18:29 slyfox Exp $
-
-EAPI="2"
-
-inherit eutils apache-module
-
-DESCRIPTION="An Apache2 module for storing and configuring virtual hosts from LDAP"
-HOMEPAGE="http://modvhostldap.alioth.debian.org/"
-SRC_URI="http://alioth.debian.org/download.php/1422/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-APACHE2_MOD_CONF="99_${PN}"
-APACHE2_MOD_DEFINE="VHOST_LDAP LDAP"
-
-DOCFILES="AUTHORS ChangeLog INSTALL README"
-
-DEPEND="=www-servers/apache-2.2*[ldap]"
-RDEPEND="${DEPEND}"
-
-need_apache2_2
-
-S="${WORKDIR}/mod-vhost-ldap-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-apache22.patch
-}
-
-src_compile() {
-	sed -i "s/MOD_VHOST_LDAP_VERSION/\"$(cat VERSION)\"/g" mod_vhost_ldap.c
-	apache-module_src_compile
-}
-
-src_install() {
-	mkdir -p "${D}"/etc/openldap/schema
-	cp -f mod_vhost_ldap.schema "${D}"/etc/openldap/schema/
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	apache-module_pkg_postinst
-	einfo
-	einfo "Your LDAP server needs to include mod_vhost_ldap.schema and should"
-	einfo "also maintain indices on apacheServerName and apacheServerAlias."
-	einfo
-}