SF.net SVN: gar:[22970] csw/mgar/pkg/mirrorbrain/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Sat Feb 8 11:20:52 CET 2014


Revision: 22970
          http://sourceforge.net/p/gar/code/22970
Author:   dmichelsen
Date:     2014-02-08 10:20:49 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
mirrorbrain/trunk: Update to 2.19.0

Modified Paths:
--------------
    csw/mgar/pkg/mirrorbrain/trunk/Makefile
    csw/mgar/pkg/mirrorbrain/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
    csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch

Modified: csw/mgar/pkg/mirrorbrain/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/Makefile	2014-02-08 10:20:49 UTC (rev 22970)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = mirrorbrain
-VERSION = 2.18.0
+VERSION = 2.19.0
 GARTYPE = v2
 
 DESCRIPTION = Content distribution tool
@@ -14,14 +14,6 @@
 DISTFILES += CSWap2-mod-mirrorbrain.postinstall
 DISTFILES += CSWap2-mod-mirrorbrain.preremove
 
-# Use patch until this is fixed:
-#   http://mirrorbrain.org/issues/issue139
-PATCHFILES += 0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
-
-# Use patch until this is fixed:
-#   
-PATCHFILES += 0001-realpath-must-get-preallocated-memory-on-Solaris.patch
-
 VENDOR_URL = http://mirrorbrain.org
 
 # Apache paths
@@ -34,7 +26,7 @@
 BUILD_DEP_PKGS += CSWapache2-dev
 BUILD_DEP_PKGS += CSWap2-mod-form
 
-PACKAGES = CSWap2-mod-mirrorbrain
+PACKAGES += CSWap2-mod-mirrorbrain
 SPKG_DESC_CSWap2-mod-mirrorbrain = MirrorBrain redirector Apache module
 PKGFILES_CSWap2-mod-mirrorbrain += $(AP2_LIBEXEC)/mod_mirrorbrain.so
 PKGFILES_CSWap2-mod-mirrorbrain += $(AP2_EXTRACONF)/mod_mirrorbrain.conf.CSW

Modified: csw/mgar/pkg/mirrorbrain/trunk/checksums
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/checksums	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/checksums	2014-02-08 10:20:49 UTC (rev 22970)
@@ -1 +1 @@
-b0b9172578cb567aec6eb7a164fba657  mirrorbrain-2.18.0.tar.gz
+e4a22a5fafba2283c58f5f7b288625c5  mirrorbrain-2.19.0.tar.gz

Deleted: csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-Do-not-take-ref-on-a-simple-scalar-string-or-it-wont.patch	2014-02-08 10:20:49 UTC (rev 22970)
@@ -1,25 +0,0 @@
-From 5ca8b992d77a3479f1081432d21f8a96382b41c6 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sat, 1 Feb 2014 14:56:06 +0100
-Subject: [PATCH] Do not take ref on a simple scalar string or it wont match
-
----
- tools/scanner.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/scanner.pl b/tools/scanner.pl
-index ab9bcb8..4216721 100755
---- a/tools/scanner.pl
-+++ b/tools/scanner.pl
-@@ -774,7 +774,7 @@ sub ftp_readdir
-   return unless defined $ftp;
-   my $text = ftp_cont($ftp, "$url/$name");
- 
--  if(!ref($text) && \$text =~ m/^(\d\d\d)\s/) {	# some FTP status code? Not good.
-+  if(!ref($text) && $text =~ m/^(\d\d\d)\s/) {	# some FTP status code? Not good.
- 
-     # Bug: Net::FTP wrongly reports timeouts (421) as code 550:
-     # sunsite.informatik.rwth-aachen.de: ftp dir: ftp://sunsite.informatik.rwth-aachen.de/pub/linux/opensuse/distribution/11.0/repo/debug/suse/i686
--- 
-1.8.4.1
-

Deleted: csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch	2014-02-07 23:02:30 UTC (rev 22969)
+++ csw/mgar/pkg/mirrorbrain/trunk/files/0001-realpath-must-get-preallocated-memory-on-Solaris.patch	2014-02-08 10:20:49 UTC (rev 22970)
@@ -1,63 +0,0 @@
-From 502e0e73c9c453c6514b44b0f6ed2a5b142c33a8 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 4 Feb 2014 10:43:45 +0100
-Subject: [PATCH] realpath must get preallocated memory on Solaris
-
----
- mod_mirrorbrain/mod_mirrorbrain.c | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/mod_mirrorbrain/mod_mirrorbrain.c b/mod_mirrorbrain/mod_mirrorbrain.c
-index 228fb65..da5fdf5 100644
---- a/mod_mirrorbrain/mod_mirrorbrain.c
-+++ b/mod_mirrorbrain/mod_mirrorbrain.c
-@@ -83,6 +83,7 @@
- 
- #include <unistd.h> /* for getpid */
- #include <math.h>   /* for sqrt() and pow() */
-+#include <limits.h> /* for PATH_MAX */
- #include <arpa/inet.h>
- #ifdef WITH_MEMCACHE
- #include "mod_memcache.h"
-@@ -1859,7 +1860,17 @@ static int mb_handler(request_rec *r)
- 
-     /* The basedir might contain symlinks. That needs to be taken into account. 
-      * See discussion in http://mirrorbrain.org/issues/issue17 */
--    ptr = realpath(cfg->mirror_base, NULL);
-+#if defined(__sun) && defined(__SVR4)
-+    ptr = malloc( PATH_MAX );
-+    if (ptr == NULL) {
-+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-+                "[mod_mirrorbrain] Error allocating memory for path for document root");
-+        return DECLINED; /* fail gracefully */
-+    }
-+#else
-+    ptr = NULL;
-+#endif
-+    ptr = realpath(cfg->mirror_base, ptr);
-     if (ptr == NULL) {
-         /* this should never happen, because the MirrorBrainEngine directive would never
-          * be applied to a non-existing directories */
-@@ -1878,8 +1889,17 @@ static int mb_handler(request_rec *r)
-         filename = apr_pstrcat(r->pool, mirror_base, "/", yum->dir, "/", yum->file, NULL);
-         debugLog(r, cfg, "yum path on disk: %s", filename);
-     }
--
--    ptr = realpath(filename, NULL);
-+#if defined(__sun) && defined(__SVR4)
-+    ptr = malloc( PATH_MAX );
-+    if (ptr == NULL) {
-+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-+                "[mod_mirrorbrain] Error allocating memory for path for filename");
-+        return DECLINED; /* fail gracefully */
-+    }
-+#else
-+    ptr = NULL;
-+#endif
-+    ptr = realpath(filename, ptr);
-     if (ptr == NULL) {
-         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, 
-                 "[mod_mirrorbrain] Error canonicalizing filename '%s'", filename);
--- 
-1.8.4.1
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list