From a9e8eca50661df6eb9b350206a0b9fe542bd736d Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Mon, 5 Jun 2006 18:41:23 +0000 Subject: [PATCH] Cleanup old files. Package-Manager: portage-2.1_rc4-r2 --- net-www/mod_xslt/Manifest | 60 ++++++----------- .../mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf | 35 ---------- .../files/mod-xslt-1.0.5a-content.patch | 54 --------------- .../files/mod-xslt-1.0.5a-debug.patch | 66 ------------------- .../files/mod_xslt-1.0.5a-register.patch | 18 ----- net-www/mod_xslt/files/mod_xslt-1.05a.patch | 22 ------- 6 files changed, 20 insertions(+), 235 deletions(-) delete mode 100644 net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf delete mode 100644 net-www/mod_xslt/files/mod-xslt-1.0.5a-content.patch delete mode 100644 net-www/mod_xslt/files/mod-xslt-1.0.5a-debug.patch delete mode 100644 net-www/mod_xslt/files/mod_xslt-1.0.5a-register.patch delete mode 100644 net-www/mod_xslt/files/mod_xslt-1.05a.patch diff --git a/net-www/mod_xslt/Manifest b/net-www/mod_xslt/Manifest index a85bc1156dfc..1be5e84feb86 100644 --- a/net-www/mod_xslt/Manifest +++ b/net-www/mod_xslt/Manifest @@ -1,40 +1,20 @@ -AUX 1.0.5a-r1/25_mod_xslt.conf 1001 RMD160 445f693fa909b41a0a3ee770c9f01c63f5aecf9d SHA1 11e92e2c24c22ec9854482bc797ba91fc90a05e7 SHA256 6289e12541f27e7888d8922ebe0663ed9d37d8dac7d5c3653488c395006c7493 -MD5 e3de159e58c2c948876fc05b3034f103 files/1.0.5a-r1/25_mod_xslt.conf 1001 -RMD160 445f693fa909b41a0a3ee770c9f01c63f5aecf9d files/1.0.5a-r1/25_mod_xslt.conf 1001 -SHA256 6289e12541f27e7888d8922ebe0663ed9d37d8dac7d5c3653488c395006c7493 files/1.0.5a-r1/25_mod_xslt.conf 1001 -AUX 25_mod_xslt.conf 350 RMD160 7541cd7494b99847e61c5ba3bc1953a0a391155f SHA1 1f82f758c85ccc11b4d80606b00b205f0238beb6 SHA256 4169ba319b061086c08743120034e3a79f0327cb589e433d6106353f37d7a07d -MD5 2779031f2b6ac43f6763189009bad231 files/25_mod_xslt.conf 350 -RMD160 7541cd7494b99847e61c5ba3bc1953a0a391155f files/25_mod_xslt.conf 350 -SHA256 4169ba319b061086c08743120034e3a79f0327cb589e433d6106353f37d7a07d files/25_mod_xslt.conf 350 -AUX mod-xslt-1.0.5a-content.patch 3616 RMD160 8fb8ee06c5fbb3cacb2b3f10f600516918d78419 SHA1 fc9f098fd09b9db31218b5eea2ce8948558abac5 SHA256 87ee9f5b10d9716cea6c4c192f7012a9f18f00f4539c3111382ab48f8edf5154 -MD5 8bbeeba1592af204503283d22a692202 files/mod-xslt-1.0.5a-content.patch 3616 -RMD160 8fb8ee06c5fbb3cacb2b3f10f600516918d78419 files/mod-xslt-1.0.5a-content.patch 3616 -SHA256 87ee9f5b10d9716cea6c4c192f7012a9f18f00f4539c3111382ab48f8edf5154 files/mod-xslt-1.0.5a-content.patch 3616 -AUX mod-xslt-1.0.5a-debug.patch 1978 RMD160 cd1ec4f569e2566411d5609888da5fc36245fddc SHA1 329de106343ec492f3d7db63be8cafa1578a2e8e SHA256 e1936f2106ad1b1cb47c5670259c8b2b22fabc9c399c8800dd4269fdd280e6d4 -MD5 54a75dbb10db178940c2a31f23f163af files/mod-xslt-1.0.5a-debug.patch 1978 -RMD160 cd1ec4f569e2566411d5609888da5fc36245fddc files/mod-xslt-1.0.5a-debug.patch 1978 -SHA256 e1936f2106ad1b1cb47c5670259c8b2b22fabc9c399c8800dd4269fdd280e6d4 files/mod-xslt-1.0.5a-debug.patch 1978 -AUX mod_xslt-1.0.5a-register.patch 671 RMD160 594e94c5803222e1067a4256c40bcc215d04658c SHA1 006b832fb687c7c057f1f8dacfa807d24d61282e SHA256 e9d1f9b7b9d230946781cd21009a62e3ee5b4fa4f6c900399190072b28aac114 -MD5 7e2fafd6b92cfb45e536cd508c0d2098 files/mod_xslt-1.0.5a-register.patch 671 -RMD160 594e94c5803222e1067a4256c40bcc215d04658c files/mod_xslt-1.0.5a-register.patch 671 -SHA256 e9d1f9b7b9d230946781cd21009a62e3ee5b4fa4f6c900399190072b28aac114 files/mod_xslt-1.0.5a-register.patch 671 -AUX mod_xslt-1.05a.patch 700 RMD160 f01160299b19b97102de9458cef663d383279b7d SHA1 83e72c5fca66cf0572c545517f56839ef44a6567 SHA256 278c86f53cbf991532765c163eca99d4c33008b2d1b4c599befb18f7e90fca63 -MD5 d7cbbfbcf4bd6baa202abdabbb1564a4 files/mod_xslt-1.05a.patch 700 -RMD160 f01160299b19b97102de9458cef663d383279b7d files/mod_xslt-1.05a.patch 700 -SHA256 278c86f53cbf991532765c163eca99d4c33008b2d1b4c599befb18f7e90fca63 files/mod_xslt-1.05a.patch 700 -DIST mod_xslt.2.0.4.tgz 16030 -EBUILD mod_xslt-2.0.4.ebuild 804 RMD160 2324f62b1a0f7a709c8127d715ce11214f5a9d36 SHA1 335839b8e5d15da4f0f7082e540f49c454f7b1a3 SHA256 f3392e9f55013d7ac2f05b990fd08351f3d193271382398f11cef0b174210760 -MD5 84310335f9a931e2667b097c931b3274 mod_xslt-2.0.4.ebuild 804 -RMD160 2324f62b1a0f7a709c8127d715ce11214f5a9d36 mod_xslt-2.0.4.ebuild 804 -SHA256 f3392e9f55013d7ac2f05b990fd08351f3d193271382398f11cef0b174210760 mod_xslt-2.0.4.ebuild 804 -MISC ChangeLog 2301 RMD160 1440767aabf09b7f0669ec1d1767e483b444444e SHA1 37ccec68f90522d17ead29f7e2ccc70fa2e4e02a SHA256 efe8a3fe0a4c976bf71d7c3a35db1d7a82dac3154f68ff9134956dcfbaafe147 -MD5 0910d36ab49056f14a3544e4c0029448 ChangeLog 2301 -RMD160 1440767aabf09b7f0669ec1d1767e483b444444e ChangeLog 2301 -SHA256 efe8a3fe0a4c976bf71d7c3a35db1d7a82dac3154f68ff9134956dcfbaafe147 ChangeLog 2301 -MISC metadata.xml 596 RMD160 23665cc72ec75ade07fd9e21301bf2f0e5d7b072 SHA1 7c51470cd6bf3852d0a7b249137ab4a46ea99fba SHA256 6a3cd4bb49105ba168beba02172f7bf969e41bbacb30d051ddbab33cf8ea2b43 -MD5 3f1cc8b3109f15a7a1a34219493e989a metadata.xml 596 -RMD160 23665cc72ec75ade07fd9e21301bf2f0e5d7b072 metadata.xml 596 -SHA256 6a3cd4bb49105ba168beba02172f7bf969e41bbacb30d051ddbab33cf8ea2b43 metadata.xml 596 -MD5 331747cbb5656939bd9533245f4dd03c files/digest-mod_xslt-2.0.4 62 -RMD160 52013b8862288a6e19572a652b3e98239ab3052c files/digest-mod_xslt-2.0.4 62 -SHA256 4cd642dad58a9c8c4daaef0a57b643ddfde60cfda6efcfe79f8defd109bb9d1d files/digest-mod_xslt-2.0.4 62 +AUX 25_mod_xslt.conf 748 RMD160 0627d85e08cdf87522a59cde74ad0da0a826af0d SHA1 91df132a03bcd79c83e9d53ce416dbc7837bb458 SHA256 baf7671167390734d469acf575735f41db44f729d8e79b40184cd9c76feb98ee +MD5 839bfaa8fedcbf8d2b8cd7e7d74237b2 files/25_mod_xslt.conf 748 +RMD160 0627d85e08cdf87522a59cde74ad0da0a826af0d files/25_mod_xslt.conf 748 +SHA256 baf7671167390734d469acf575735f41db44f729d8e79b40184cd9c76feb98ee files/25_mod_xslt.conf 748 +DIST mod_xslt.2.0.4.tgz 16030 RMD160 03eecb0a933cd07b77e1c226ecbe91c4cbbf5c87 SHA1 7abded769da88fcf24a58984d33e1236e196baa1 SHA256 8baceed9852b385913e036a24eccf4e64c9a2c435399bfc4967fd4df11a0cfab +EBUILD mod_xslt-2.0.4.ebuild 761 RMD160 0d7c577db9e76d4115da43ebca8669fca32c7fdd SHA1 e261207c8722fd8064a5b7100f9f4903d68978c0 SHA256 045a480cbc0ac5d304a9a10952e0f8339125c36a1b0ffaa9cfb6724919413d7c +MD5 6dfd976dd88397910999a1423acde930 mod_xslt-2.0.4.ebuild 761 +RMD160 0d7c577db9e76d4115da43ebca8669fca32c7fdd mod_xslt-2.0.4.ebuild 761 +SHA256 045a480cbc0ac5d304a9a10952e0f8339125c36a1b0ffaa9cfb6724919413d7c mod_xslt-2.0.4.ebuild 761 +MISC ChangeLog 2638 RMD160 2959aa87a8feb2a9f58926d026255c8ac265ee6b SHA1 046d0870f6a6491c6b2acd39010b4fb6ee905b9e SHA256 63b44e57a4bea4addd3e809e0b6535bb6e40dbfe7cfdef0266cd966b9e33d0d1 +MD5 e9d56a8a1b22d73775bd162a7760d166 ChangeLog 2638 +RMD160 2959aa87a8feb2a9f58926d026255c8ac265ee6b ChangeLog 2638 +SHA256 63b44e57a4bea4addd3e809e0b6535bb6e40dbfe7cfdef0266cd966b9e33d0d1 ChangeLog 2638 +MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 +MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231 +RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231 +SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 metadata.xml 231 +MD5 172b03cc798f08e0964eeca10fa0ecbd files/digest-mod_xslt-2.0.4 232 +RMD160 8bfc111a69862bf625d6917d871580cc425c000b files/digest-mod_xslt-2.0.4 232 +SHA256 814e261f756d25ea6766aba3a647ae8ad4fb7428eb73b1873a03b98798697f19 files/digest-mod_xslt-2.0.4 232 diff --git a/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf b/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf deleted file mode 100644 index 45219f627341..000000000000 --- a/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/files/1.0.5a-r1/25_mod_xslt.conf,v 1.1 2005/01/10 23:08:18 trapni Exp $ - - - - LoadModule mod_xslt modules/mod_xslt.so - - - -### EXAMPLE 1: transform all .xml files -### -# -# AddOutputFilter mod-xslt .xml -# - -### EXAMPLE 2: transform all files within a special location (_REPLACE_ME_) -### -# -# -# SetOutputFilter mod-xslt -# -# - -### EXAMPLE 3: transform all files whose content type is either -### text/xml or application/xml within a given directory -### -# -# -# AddOutputFilterByType mod-xslt text/xml -# AddOutputFilterByType mod-xslt application/xml -# -# - -# vim:syntax=apache diff --git a/net-www/mod_xslt/files/mod-xslt-1.0.5a-content.patch b/net-www/mod_xslt/files/mod-xslt-1.0.5a-content.patch deleted file mode 100644 index 5a71ba7d2085..000000000000 --- a/net-www/mod_xslt/files/mod-xslt-1.0.5a-content.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urN mod-xslt-1.0.5a/src/mod-xslt.c mod-xslt-1.0.5a-noencoding/src/mod-xslt.c ---- mod-xslt-1.0.5a/src/mod-xslt.c 2002-10-27 19:16:41.000000000 +0100 -+++ mod-xslt-1.0.5a-noencoding/src/mod-xslt.c 2003-07-23 15:11:44.000000000 +0200 -@@ -113,26 +113,26 @@ - - void xslt_set_headers(apr_table_t *resheaders, apr_pool_t *pool, xsltStylesheetPtr stylesheet) { - if (stylesheet->encoding){ -- apr_table_set(resheaders, "Content-Encoding", (const char*)stylesheet->encoding); -+ apr_table_set(resheaders, "X-Charset", (const char*)stylesheet->encoding); - } else { -- apr_table_set(resheaders, "Content-Encoding", "UTF-8"); -+ apr_table_set(resheaders, "X-Charset", "UTF-8"); - } - - if (stylesheet->mediaType){ -- apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s",(const char*)stylesheet->mediaType,apr_table_get(resheaders,"Content-Encoding"))); -+ apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s",(const char*)stylesheet->mediaType,apr_table_get(resheaders,"X-Charset"))); - } else { - if (stylesheet->method){ - if (strcmp((char*)stylesheet->method,"xml") == 0){ -- apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/xml",apr_table_get(resheaders,"Content-Encoding"))); -+ apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/xml",apr_table_get(resheaders,"X-Charset"))); - } else if (strcmp((char*)stylesheet->method,"html") == 0){ -- apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"Content-Encoding"))); -+ apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"X-Charset"))); - }else if (strcmp((char*)stylesheet->method,"text") == 0){ -- apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/plain",apr_table_get(resheaders,"Content-Encoding"))); -+ apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/plain",apr_table_get(resheaders,"X-Charset"))); - } else { -- apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"Content-Encoding"))); -+ apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"X-Charset"))); - } - } else { -- apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"Content-Encoding"))); -+ apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"X-Charset"))); - } - } - } -@@ -229,13 +229,12 @@ - writeLog(APLOG_ERR,"%s could not be transformed",f->r->unparsed_uri); - } else { - xslt_set_headers(f->r->headers_out,f->r->pool,stylesheet); -- f->r->content_encoding=apr_table_get(f->r->headers_out, "Content-Encoding"); - f->r->content_type=apr_table_get(f->r->headers_out, "Content-Type"); -- writeLog(APLOG_DEBUG,"charset = %s",apr_table_get(f->r->headers_out,"Content-Encoding")); -+ writeLog(APLOG_DEBUG,"charset = %s",apr_table_get(f->r->headers_out,"X-Charset")); - - xmlSetGenericErrorFunc(NULL, xslt_error); - xsltSetGenericErrorFunc(NULL, xslt_error); -- encoder = xmlFindCharEncodingHandler((const char*)apr_table_get(f->r->headers_out,"Content-Encoding")); -+ encoder = xmlFindCharEncodingHandler((const char*)apr_table_get(f->r->headers_out,"X-Charset")); - if (encoder) { - writeLog(APLOG_DEBUG,"found encoder"); - output = xmlAllocOutputBuffer(encoder); diff --git a/net-www/mod_xslt/files/mod-xslt-1.0.5a-debug.patch b/net-www/mod_xslt/files/mod-xslt-1.0.5a-debug.patch deleted file mode 100644 index 504799caedf3..000000000000 --- a/net-www/mod_xslt/files/mod-xslt-1.0.5a-debug.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -urN mod-xslt-1.0.5a/src/logging.c mod-xslt-1.0.5a-nodebug/src/logging.c ---- mod-xslt-1.0.5a/src/logging.c 2002-08-13 12:03:07.000000000 +0200 -+++ mod-xslt-1.0.5a-nodebug/src/logging.c 2003-07-23 12:05:31.000000000 +0200 -@@ -49,7 +49,6 @@ - #ifndef LOGLEVEL - #define LOGLEVEL 8 - #endif --#define DEBUG - - #ifndef LOGPREFIX - #define LOGPREFIX "mod-xslt: %s" -@@ -59,7 +58,7 @@ - - void initLog(request_rec* r) { - request=r; -- writeLog(7,"start logging"); -+ writeLog(APLOG_DEBUG, "start logging"); - return; - } - -@@ -84,7 +83,7 @@ - #endif - if ((tmplen > 0) & (temp != NULL)) { - if (temp[0] != 0) { -- ap_log_rerror(APLOG_MARK,level, 0, request, LOGPREFIX, temp); -+ ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|level, 0, request, LOGPREFIX, temp); - } - } - } -@@ -93,7 +92,7 @@ - } - - void finiLog() { -- writeLog(7,"stop logging"); -+ writeLog(APLOG_DEBUG,"stop logging"); - request=NULL; - return; - } -diff -urN mod-xslt-1.0.5a/src/mod-xslt.c mod-xslt-1.0.5a-nodebug/src/mod-xslt.c ---- mod-xslt-1.0.5a/src/mod-xslt.c 2002-10-27 19:16:41.000000000 +0100 -+++ mod-xslt-1.0.5a-nodebug/src/mod-xslt.c 2003-07-23 12:03:07.000000000 +0200 -@@ -106,7 +106,7 @@ - tmplen = vsnprintf(temp,tmplen,msg,args); - va_end; - temp[tmplen] = 0; -- writeLog(APLOG_NOTICE,temp); -+ writeLog(APLOG_ERR, temp); - free(temp); - return; - } -@@ -313,13 +313,13 @@ - } - - static apr_status_t xslt_child_exit(void *data) { -- ap_log_perror(APLOG_MARK,APLOG_NOTICE, 0, (apr_pool_t *)data, "Finalizing Child"); -+ ap_log_perror(APLOG_MARK,APLOG_NOERRNO|APLOG_DEBUG, 0, (apr_pool_t *)data, "Finalizing Child"); - xmlCleanupParser(); - xmlMemoryDump(); - } - - static void xslt_child_init(apr_pool_t *p, server_rec *s) { -- ap_log_perror(APLOG_MARK,APLOG_NOTICE, 0, p, "Initializing Child"); -+ ap_log_perror(APLOG_MARK,APLOG_NOERRNO|APLOG_DEBUG, 0, p, "Initializing Child"); - apr_pool_cleanup_register(p, p, xslt_child_exit, xslt_child_exit); - xmlInitMemory(); - xmlLineNumbersDefault(XSL_LINENUMBERSDEFAULT); diff --git a/net-www/mod_xslt/files/mod_xslt-1.0.5a-register.patch b/net-www/mod_xslt/files/mod_xslt-1.0.5a-register.patch deleted file mode 100644 index 85d30fa00482..000000000000 --- a/net-www/mod_xslt/files/mod_xslt-1.0.5a-register.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/mod-xslt.c 2002-10-27 19:16:41.000000000 +0100 -+++ src/mod-xslt.c.oden 2002-11-04 00:49:43.000000000 +0100 -@@ -327,7 +327,15 @@ - xmlLoadExtDtdDefaultValue=1; - } - -+static int xslt_init_handler(apr_pool_t *p, apr_pool_t *plog, -+ apr_pool_t *ptemp, server_rec *s) -+{ -+ ap_add_version_component(p, "mod_xslt/1.0.5a"); -+ return OK; -+} -+ - static void xslt_register_hooks(apr_pool_t *p) { -+ ap_hook_post_config(xslt_init_handler, NULL, NULL, APR_HOOK_MIDDLE); - ap_hook_child_init(xslt_child_init, NULL, NULL, APR_HOOK_MIDDLE); - #ifdef OLD_APACHE_FILTER_API - ap_register_output_filter("mod-xslt", xslt_filter, AP_FTYPE_RESOURCE); diff --git a/net-www/mod_xslt/files/mod_xslt-1.05a.patch b/net-www/mod_xslt/files/mod_xslt-1.05a.patch deleted file mode 100644 index d56da43ca13d..000000000000 --- a/net-www/mod_xslt/files/mod_xslt-1.05a.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/mod-xslt.c.orig 2003-09-21 22:35:43.000000000 +0000 -+++ src/mod-xslt.c 2003-09-21 22:37:15.000000000 +0000 -@@ -104,7 +104,7 @@ - temp = (char*)malloc((tmplen + 1) *sizeof(char)); - va_start(args,msg); - tmplen = vsnprintf(temp,tmplen,msg,args); -- va_end; -+ va_end(args); - temp[tmplen] = 0; - writeLog(APLOG_NOTICE,temp); - free(temp); ---- src/logging.c.orig 2003-09-21 22:35:43.000000000 +0000 -+++ src/logging.c 2003-09-21 22:37:27.000000000 +0000 -@@ -74,7 +74,7 @@ - temp = (char*)malloc((tmplen + 2) *sizeof(char)); - va_start(args,msg); - tmplen = vsnprintf(temp,tmplen + 1,msg,args); -- va_end; -+ va_end(args); - temp[tmplen + 1] = 0; - if (request && (level < LOGLEVEL)) { - #ifdef DEBUG -- 2.26.2