Bug#864655: marked as done (stretch-pu: package trafficserver/7.0.0-5+deb9u1)

To: Julien Cristau <jcristau@debian.org>
Subject: Bug#864655: marked as done (stretch-pu: package trafficserver/7.0.0-5+deb9u1)
From: owner@bugs.debian.org (Debian Bug Tracking System)
Date: Sat, 02 Dec 2017 16:51:06 +0000
Message-id: <[🔎] handler.864655.D864655.15122333961463.ackdone@bugs.debian.org>
Reply-to: 864655@bugs.debian.org
References: <20171202164938.rm4fddjc5jdymec2@betterave.cristau.org> <CAMr=8w6E9vJOFqjQqcgWJO0awku_MrRuvybF=FRPf3x3dDhwJw@mail.gmail.com>

Your message dated Sat, 2 Dec 2017 17:49:38 +0100
with message-id <20171202164938.rm4fddjc5jdymec2@betterave.cristau.org>
and subject line Re: Bug#864655: stretch-pu: package trafficserver/7.0.0-5+deb9u1
has caused the Debian Bug report #864655,
regarding stretch-pu: package trafficserver/7.0.0-5+deb9u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
864655: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864655
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems

--- Begin Message ---

To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: stretch-pu: package trafficserver/7.0.0-5+deb9u1
From: Aron Xu <aron@debian.org>
Date: Mon, 12 Jun 2017 21:58:07 +0800
Message-id: <CAMr=8w6E9vJOFqjQqcgWJO0awku_MrRuvybF=FRPf3x3dDhwJw@mail.gmail.com>

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

I'd like to apply the attached patch as first pu for trafficserver in
stretch, it fixes the build on kfreebsd and arm architectures.


Regards,
Aron

diff --git a/debian/changelog b/debian/changelog
index 8c25b126..7ff51263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+trafficserver (7.0.0-5+deb9u1) UNRELEASED; urgency=medium
+
+  * Update d/rules to reflect healthcheck being managed as a stable plugin
+  * Add a patch to fix kfreebsd build
+  * Add a patch to fix arm build
+
+ -- Jean Baptiste Favre <debian@jbfavre.org>  Mon, 29 May 2017 14:45:52 +0200
+
 trafficserver (7.0.0-5) unstable; urgency=medium
 
   * Add patch to fix arm* build. (Closes: #857389)
diff --git a/debian/patches/0007-fix_build_kfreebsd.patch b/debian/patches/0007-fix_build_kfreebsd.patch
new file mode 100644
index 00000000..46f4ac8d
--- /dev/null
+++ b/debian/patches/0007-fix_build_kfreebsd.patch
@@ -0,0 +1,39 @@
+Description: Fix kfreebsd build skipping malloc_np.h include
+Author: Jean Baptiste Favre <debiabn@jbfavre.org>
+Origin: other
+Last-Update: 2017-03-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/lib/ts/ink_memory.cc
++++ b/lib/ts/ink_memory.cc
+@@ -27,7 +27,7 @@
+ #include "ts/Diags.h"
+ #include "ts/ink_atomic.h"
+ 
+-#if defined(freebsd)
++#if !defined(kfreebsd) && defined(freebsd)
+ #include <malloc_np.h> // for malloc_usable_size
+ #endif
+ 
+--- a/proxy/Plugin.cc
++++ b/proxy/Plugin.cc
+@@ -124,7 +124,7 @@ plugin_load(int argc, char *argv[], bool validateOnly)
+       return false; // this line won't get called since Fatal brings down ATS
+     }
+ 
+-#if defined(freebsd) || defined(darwin)
++#if (!defined(kfreebsd) && defined(freebsd)) || defined(darwin)
+     optreset = 1;
+ #endif
+ #if defined(__GLIBC__)
+--- a/proxy/http/remap/RemapConfig.cc
++++ b/proxy/http/remap/RemapConfig.cc
+@@ -902,7 +902,7 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
+   void *ih         = NULL;
+   TSReturnCode res = TS_SUCCESS;
+   if (pi->fp_tsremap_new_instance) {
+-#if defined(freebsd) || defined(darwin)
++#if (!defined(kfreebsd) && defined(freebsd)) || defined(darwin)
+     optreset = 1;
+ #endif
+ #if defined(__GLIBC__)
diff --git a/debian/patches/0008-fix_build_armel.patch b/debian/patches/0008-fix_build_armel.patch
new file mode 100644
index 00000000..4b12a506
--- /dev/null
+++ b/debian/patches/0008-fix_build_armel.patch
@@ -0,0 +1,42 @@
+--- a/plugins/header_rewrite/lulu.h
++++ b/plugins/header_rewrite/lulu.h
+@@ -48,9 +48,36 @@ uint16_t getPort(sockaddr const *s_socka
+ #define rmb() __asm__ __volatile__("sync" : : : "memory")
+ #define wmb() __asm__ __volatile__("" : : : "memory")
+ #elif defined(__arm__)
+-#define mb() __asm__ __volatile__("dmb" : : : "memory")
+-#define rmb() __asm__ __volatile__("dmb" : : : "memory")
+-#define wmb() __asm__ __volatile__("" : : : "memory")
++  #if defined(__ARM_ARCH_4__) \
++     || defined(__ARM_ARCH_4T__) \
++     || defined(__ARM_ARCH_5__) \
++     || defined(__ARM_ARCH_5E__)  \
++     || defined(__ARM_ARCH_5T__) \
++     || defined(__ARM_ARCH_5TE__) \
++     || defined(__ARM_ARCH_5TEJ__) \
++     || defined(__ARM_ARCH_6__) \
++     || defined __ARM_ARCH_6J__  \
++     || defined(__ARM_ARCH_6K__) \
++     || defined(__ARM_ARCH_6Z) \
++     || defined(__ARM_ARCH_6ZK__) \
++     || defined(__ARM_ARCH_6T2__)
++    #if defined(__thumb__)
++      // This is just a placeholder and almost certainly not sufficient.
++      #define mb() __asm__ __volatile__ ("" : : : "memory");
++      #define rmb() __asm__ __volatile__("" : : : "memory")
++      #define wmb() __asm__ __volatile__("" : : : "memory")
++    #else // defined(__thumb__)
++      int a = 0, b = 0;
++      #define mb() __asm__ __volatile__ ("mcr p15,0,%0,c7,c10,5" : : "r" (0) : "memory")
++      #define rmb() mb()
++      #define wmb() __asm__ __volatile__("" : : : "memory")
++    #endif // defined(__thumb__)
++  #else
++    // ARMv7 and later.
++    #define mb() __asm__ __volatile__("dmb" : : : "memory")
++    #define rmb() __asm__ __volatile__("dmb" : : : "memory")
++    #define wmb() __asm__ __volatile__("" : : : "memory")
++  #endif
+ #elif defined(__mips__)
+ #define mb() __asm__ __volatile__("sync" : : : "memory")
+ #define rmb() __asm__ __volatile__("sync" : : : "memory")
diff --git a/debian/patches/series b/debian/patches/series
index e3a27b9c..9916d6ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@
 0004-force-use-luajit-system-remove-lib-luajit.patch
 0005-fix_documentation_build.patch
 0006-fix_arm_build.patch
+0007-fix_build_kfreebsd.patch
+0008-fix_build_armel.patch
diff --git a/debian/rules b/debian/rules
index 2c8a1169..8f33657f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ override_dh_auto_install:
 ifneq ($(DEB_HOST_ARCH_OS),linux)
 	# Remove Linux-specific plugin
 	sed -i '/\/healthchecks\.so$$/d' \
-		debian/trafficserver-experimental-plugins.install
+		debian/trafficserver.install
 endif
 
 override_dh_install:

--- End Message ---

--- Begin Message ---

To: Aron Xu <aron@debian.org>, 864655-done@bugs.debian.org

Subject: Re: Bug#864655: stretch-pu: package trafficserver/7.0.0-5+deb9u1

From: Julien Cristau <jcristau@debian.org>

Date: Sat, 2 Dec 2017 17:49:38 +0100

Message-id: <20171202164938.rm4fddjc5jdymec2@betterave.cristau.org>

In-reply-to: <CAMr=8w6E9vJOFqjQqcgWJO0awku_MrRuvybF=FRPf3x3dDhwJw@mail.gmail.com>

References: <CAMr=8w6E9vJOFqjQqcgWJO0awku_MrRuvybF=FRPf3x3dDhwJw@mail.gmail.com>
Control: tag -1 wontfix

On Mon, Jun 12, 2017 at 21:58:07 +0800, Aron Xu wrote:

> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: pu
> 
> I'd like to apply the attached patch as first pu for trafficserver in
> stretch, it fixes the build on kfreebsd and arm architectures.
> 
Sorry, the time for portability fixes is before release.

Cheers,
Julien
--- End Message ---

Reply to:

Prev by Date: Processed: Re: Bug#864631: stretch-pu: jetty9/9.2.22-1
Next by Date: Bug#877594: marked as done (stretch-pu: package texstudio/2.11.2+debian-1+deb9u1)
Previous by thread: Processed: Re: Bug#864631: stretch-pu: jetty9/9.2.22-1
Next by thread: Bug#877594: marked as done (stretch-pu: package texstudio/2.11.2+debian-1+deb9u1)
Index(es):
- Date
- Thread