tags 667396 + patch
thanks
marked as pending on Thu, 17 May 2012, now uploading just the fix for the build
failure.
diff -Nru trafficserver-3.0.4/debian/changelog
trafficserver-3.0.4/debian/changelog
--- trafficserver-3.0.4/debian/changelog 2012-03-21 13:05:34.000000000
+0100
+++ trafficserver-3.0.4/debian/changelog 2012-05-30 06:41:16.000000000
+0200
@@ -1,3 +1,10 @@
+trafficserver (3.0.4-1.1) unstable; urgency=low
+
+ * Non maintainer upload
+ * Fix build failure with GCC 4.7. Closes: #667396.
+
+ -- Matthias Klose <d...@debian.org> Wed, 30 May 2012 04:40:28 +0000
+
trafficserver (3.0.4-1) unstable; urgency=high
* New upstream release
diff -Nru trafficserver-3.0.4/debian/patches/g++-4.7.patch
trafficserver-3.0.4/debian/patches/g++-4.7.patch
--- trafficserver-3.0.4/debian/patches/g++-4.7.patch 1970-01-01
01:00:00.000000000 +0100
+++ trafficserver-3.0.4/debian/patches/g++-4.7.patch 2012-05-30
06:56:54.000000000 +0200
@@ -0,0 +1,148 @@
+Index: trafficserver-3.0.4/lib/ts/Map.h
+===================================================================
+--- trafficserver-3.0.4.orig/lib/ts/Map.h 2012-03-18 02:02:10.000000000
+0100
++++ trafficserver-3.0.4/lib/ts/Map.h 2012-05-30 06:56:51.916049817 +0200
+@@ -237,7 +237,7 @@
+ template <class K, class C, class A> inline C
+ Map<K,C,A>::get(K akey) {
+ MapElem<K,C> e(akey, (C)0);
+- MapElem<K,C> *x = set_in(e);
++ MapElem<K,C> *x = this->set_in(e);
+ if (x)
+ return x->value;
+ return (C)0;
+@@ -246,7 +246,7 @@
+ template <class K, class C, class A> inline C *
+ Map<K,C,A>::getp(K akey) {
+ MapElem<K,C> e(akey, (C)0);
+- MapElem<K,C> *x = set_in(e);
++ MapElem<K,C> *x = this->set_in(e);
+ if (x)
+ return &x->value;
+ return 0;
+@@ -255,22 +255,22 @@
+ template <class K, class C, class A> inline MapElem<K,C> *
+ Map<K,C,A>::put(K akey, C avalue) {
+ MapElem<K,C> e(akey, avalue);
+- MapElem<K,C> *x = set_in(e);
++ MapElem<K,C> *x = this->set_in(e);
+ if (x) {
+ x->value = avalue;
+ return x;
+ } else
+- return set_add(e);
++ return this->set_add(e);
+ }
+
+ template <class K, class C, class A> inline MapElem<K,C> *
+ Map<K,C,A>::put(K akey) {
+ MapElem<K,C> e(akey, 0);
+- MapElem<K,C> *x = set_in(e);
++ MapElem<K,C> *x = this->set_in(e);
+ if (x)
+ return x;
+ else
+- return set_add(e);
++ return this->set_add(e);
+ }
+
+ template <class K, class C, class A> inline void
+@@ -463,7 +463,7 @@
+ uintptr_t h = AHashFns::hash(c);
+ List<C,A> *l;
+ MapElem<uintptr_t,List<C,A> > e(h, (C)0);
+- MapElem<uintptr_t,List<C,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<C,A> > *x = this->set_in(e);
+ if (x)
+ l = &x->value;
+ else {
+@@ -482,7 +482,7 @@
+ uintptr_t h = AHashFns::hash(c);
+ List<C> empty;
+ MapElem<uintptr_t,List<C,A> > e(h, empty);
+- MapElem<uintptr_t,List<C,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<C,A> > *x = this->set_in(e);
+ if (!x)
+ return 0;
+ List<C> *l = &x->value;
+@@ -497,7 +497,7 @@
+ uintptr_t h = AHashFns::hash(c);
+ List<C, A> *l;
+ MapElem<uintptr_t,List<C,A> > e(h, (C)0);
+- MapElem<uintptr_t,List<C,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<C,A> > *x = this->set_in(e);
+ if (x)
+ l = &x->value;
+ else {
+@@ -513,7 +513,7 @@
+ uintptr_t h = AHashFns::hash(c);
+ List<C,A> empty;
+ MapElem<uintptr_t,List<C,A> > e(h, empty);
+- MapElem<uintptr_t,List<C,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<C,A> > *x = this->set_in(e);
+ if (!x)
+ return 0;
+ List<C,A> *l = &x->value;
+@@ -537,7 +537,7 @@
+ uintptr_t h = AHashFns::hash(c);
+ List<C> *l;
+ MapElem<uintptr_t,List<C,A> > e(h, (C)0);
+- MapElem<uintptr_t,List<C,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<C,A> > *x = this->set_in(e);
+ if (x)
+ l = &x->value;
+ else
+@@ -564,7 +564,7 @@
+ List<MapElem<K,C>,A> *l;
+ MapElem<K, C> c(akey, avalue);
+ MapElem<uintptr_t,List<MapElem<K,C>,A> > e(h, empty);
+- MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = this->set_in(e);
+ if (x)
+ l = &x->value;
+ else {
+@@ -585,7 +585,7 @@
+ uintptr_t h = AHashFns::hash(akey);
+ List<MapElem<K,C>, A> empty;
+ MapElem<uintptr_t,List<MapElem<K,C>,A> > e(h, empty);
+- MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = this->set_in(e);
+ if (!x)
+ return 0;
+ List<MapElem<K,C>,A> *l = &x->value;
+@@ -603,7 +603,7 @@
+ List<MapElem<K,C>,A> *l;
+ MapElem<K, C> c(akey, avalue);
+ MapElem<uintptr_t,List<MapElem<K,C>,A> > e(h, empty);
+- MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = this->set_in(e);
+ if (x)
+ l = &x->value;
+ else {
+@@ -622,7 +622,7 @@
+ uintptr_t h = AHashFns::hash(akey);
+ List<MapElem<K,C>,A> empty;
+ MapElem<uintptr_t,List<MapElem<K,C>,A> > e(h, empty);
+- MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = this->set_in(e);
+ if (!x)
+ return 0;
+ List<MapElem<K,C>,A> *l = &x->value;
+@@ -638,7 +638,7 @@
+ List<MapElem<K,C>,A> empty;
+ List<MapElem<K,C>,A> *l;
+ MapElem<uintptr_t,List<MapElem<K,C>,A> > e(h, empty);
+- MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = set_in(e);
++ MapElem<uintptr_t,List<MapElem<K,C>,A> > *x = this->set_in(e);
+ if (x)
+ l = &x->value;
+ else
+@@ -687,7 +687,7 @@
+ else
+ while (*a) h = h * 27 + (unsigned char)*a++;
+ MapElem<uintptr_t,List<cchar*, A> > me(h, (char*)0);
+- MapElem<uintptr_t,List<cchar*, A> > *x = set_in(me);
++ MapElem<uintptr_t,List<cchar*, A> > *x = this->set_in(me);
+ if (x) {
+ List<cchar*, A> *l = &x->value;
+ typedef ConsCell<cchar *, A> TT;
diff -Nru trafficserver-3.0.4/debian/patches/series
trafficserver-3.0.4/debian/patches/series
--- trafficserver-3.0.4/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ trafficserver-3.0.4/debian/patches/series 2012-05-30 06:40:23.000000000
+0200
@@ -0,0 +1 @@
+g++-4.7.patch
