[Debian-iot-packaging] [alljoyn-services-1504] 02/02: Imported Debian patch 15.04-4
Thorsten Alteholz
alteholz at moszumanska.debian.org
Mon Jun 27 18:00:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository alljoyn-services-1504.
commit 0c9faaff5e0755d682d4e68eb05bde1b703ad807
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Sat Jun 25 12:28:32 2016 +0200
Imported Debian patch 15.04-4
---
debian/changelog | 6 ++
debian/old/liballjoyn-c-dev-1504.install | 5 --
debian/old/liballjoyn-c1504.install | 2 -
debian/old/liballjoyn-c1504.links | 3 -
debian/old/liballjoyn-common-dev-1504.install | 2 -
debian/old/liballjoyn-dev-1504.install | 7 ---
debian/old/liballjoyn1504.install | 3 -
debian/old/liballjoyn1504.links | 3 -
debian/old/patches/hardening.patch | 45 --------------
debian/old/patches/remove-bsd-source.patch | 63 -------------------
debian/old/patches/series | 4 --
debian/patches/no-bsymbolic.patch | 89 +++++++++++++++++++++++++++
debian/patches/series | 1 +
13 files changed, 96 insertions(+), 137 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63bb195..a963ab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+alljoyn-services-1504 (15.04-4) unstable; urgency=medium
+
+ * add no-bsymbolic.patch
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sat, 25 Jun 2016 12:28:32 +0200
+
alljoyn-services-1504 (15.04-3) unstable; urgency=medium
* debian/rules: take CPU mapping from alljoyn-core-1504
diff --git a/debian/old/liballjoyn-c-dev-1504.install b/debian/old/liballjoyn-c-dev-1504.install
deleted file mode 100755
index 5281039..0000000
--- a/debian/old/liballjoyn-c-dev-1504.install
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/dh-exec
-build/*/*/*/dist/c/inc/a* /usr/include/${DEB_HOST_MULTIARCH}
-build/*/*/*/obj/alljoyn_c/liballjoyn_c.so /usr/lib/${DEB_HOST_MULTIARCH}
-build/*/*/*/obj/alljoyn_c/liballjoyn_c.a /usr/lib/${DEB_HOST_MULTIARCH}
-build/*/*/*/obj/common/libcommon_static.a /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/old/liballjoyn-c1504.install b/debian/old/liballjoyn-c1504.install
deleted file mode 100755
index 3cded9c..0000000
--- a/debian/old/liballjoyn-c1504.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-build/*/*/*/obj/alljoyn_c/liballjoyn_c.so.* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/old/liballjoyn-c1504.links b/debian/old/liballjoyn-c1504.links
deleted file mode 100755
index 078b2c1..0000000
--- a/debian/old/liballjoyn-c1504.links
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/dh-exec
-# this gives a lintian E:, so better avoid: /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn.so.${VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn.so.${SONAME}
-#/usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn_c.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn_c.so
diff --git a/debian/old/liballjoyn-common-dev-1504.install b/debian/old/liballjoyn-common-dev-1504.install
deleted file mode 100755
index a6d29ba..0000000
--- a/debian/old/liballjoyn-common-dev-1504.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-build/*/*/*/dist/c/inc/q* /usr/include/${DEB_HOST_MULTIARCH}
diff --git a/debian/old/liballjoyn-dev-1504.install b/debian/old/liballjoyn-dev-1504.install
deleted file mode 100755
index d8e0344..0000000
--- a/debian/old/liballjoyn-dev-1504.install
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /usr/bin/dh-exec
-build/*/*/*/dist/cpp/inc/a* /usr/include/${DEB_HOST_MULTIARCH}
-build/*/*/*/obj/alljoyn_core/liballjoyn.so /usr/lib/${DEB_HOST_MULTIARCH}
-build/*/*/*/obj/alljoyn_core/liballjoyn.a /usr/lib/${DEB_HOST_MULTIARCH}
-#build/*/*/*/dist/cpp/lib/liballjoyn_about.so /usr/lib/${DEB_HOST_MULTIARCH}
-build/*/*/*/obj/about/cpp/src/liballjoyn_about.so /usr/lib/${DEB_HOST_MULTIARCH}
-build/*/*/*/dist/cpp/lib/liballjoyn_about.a /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/old/liballjoyn1504.install b/debian/old/liballjoyn1504.install
deleted file mode 100755
index 4aaf2b7..0000000
--- a/debian/old/liballjoyn1504.install
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/dh-exec
-build/*/*/*/obj/alljoyn_core/liballjoyn.so.* /usr/lib/${DEB_HOST_MULTIARCH}
-build/*/*/*/dist/cpp/lib/liballjoyn_about.so.* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/old/liballjoyn1504.links b/debian/old/liballjoyn1504.links
deleted file mode 100755
index 4e511c2..0000000
--- a/debian/old/liballjoyn1504.links
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/dh-exec
-# this gives a lintian E:, so better avoid: /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so.${VERSION} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so.${SONAME}
-#/usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so.${SONAME} /usr/lib/${DEB_HOST_MULTIARCH}/liballjoyn++.so
diff --git a/debian/old/patches/hardening.patch b/debian/old/patches/hardening.patch
deleted file mode 100644
index cb73541..0000000
--- a/debian/old/patches/hardening.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: add hardening flags to Alljoyn scons stuff
-Index: alljoyn-core/build_core/conf/linux/SConscript
-===================================================================
---- alljoyn-core.orig/build_core/conf/linux/SConscript 2016-05-15 12:01:14.000000000 +0200
-+++ alljoyn-core/build_core/conf/linux/SConscript 2016-05-15 12:01:14.000000000 +0200
-@@ -36,6 +36,7 @@
- '-fno-unwind-tables',
- '-ffunction-sections',
- '-fdata-sections',
-+ '-D_FORTIFY_SOURCE=2',
- '-Wno-long-long'])
-
- env.Append(CXXFLAGS = ['-Wall',
-@@ -48,12 +49,16 @@
- '-fno-unwind-tables',
- '-ffunction-sections',
- '-fdata-sections',
-+ '-D_FORTIFY_SOURCE=2',
- '-Wno-long-long',
- '-Wno-deprecated',
- '-Wno-unknown-pragmas'])
-
- env.Append(JAVACFLAGS = ['-Xlint', '-Xlint:-serial'])
-
-+env.Append(LINKFLAGS = ['-z', 'relro', '-z', 'now'])
-+
-+
- # Debug/Release Variants
- if env['VARIANT'] == 'debug':
- env.Append(CFLAGS = '-g')
-Index: alljoyn-core/alljoyn_core/router/posix/SConscript
-===================================================================
---- alljoyn-core.orig/alljoyn_core/router/posix/SConscript 2016-05-15 12:01:14.000000000 +0200
-+++ alljoyn-core/alljoyn_core/router/posix/SConscript 2016-05-15 12:01:40.000000000 +0200
-@@ -15,6 +15,10 @@
-
- Import('router_env', 'router_objs', 'srobj')
-
-+router_env.Append(LINKFLAGS = ['-fPIE', '-pie'])
-+router_env.Append(CFLAGS = ['-fPIE'])
-+router_env.Append(CPPFLAGS = ['-fPIE'])
-+
- # Build the posix daemon and service launcher helper.
- if router_env['OS'] != 'darwin':
- daemon_env = router_env.Clone()
diff --git a/debian/old/patches/remove-bsd-source.patch b/debian/old/patches/remove-bsd-source.patch
deleted file mode 100644
index 8521c12..0000000
--- a/debian/old/patches/remove-bsd-source.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: Thorsten Alteholz <debian at alteholz.de>
-Description: replace the deprecated _BSD_SOURCE symbol by _DEFAULT_SOURCE
- Patch has been sent upstream and was merged to master branch
-Index: alljoyn-core/alljoyn_c/samples/basic/basic_c_client.c
-===================================================================
---- alljoyn-core.orig/alljoyn_c/samples/basic/basic_c_client.c 2016-05-14 11:29:48.000000000 +0200
-+++ alljoyn-core/alljoyn_c/samples/basic/basic_c_client.c 2016-05-14 11:30:14.000000000 +0200
-@@ -22,6 +22,7 @@
- ******************************************************************************/
- #ifndef _WIN32
- #define _BSD_SOURCE /* usleep */
-+#define _DEFAULT_SOURCE /* usleep */
- #endif
- #include <alljoyn_c/AjAPI.h>
-
-Index: alljoyn-core/alljoyn_c/samples/basic/basic_c_service.c
-===================================================================
---- alljoyn-core.orig/alljoyn_c/samples/basic/basic_c_service.c 2016-05-14 11:29:48.000000000 +0200
-+++ alljoyn-core/alljoyn_c/samples/basic/basic_c_service.c 2016-05-14 11:30:19.000000000 +0200
-@@ -25,6 +25,7 @@
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- ******************************************************************************/
- #ifndef _WIN32
-+#define _DEFAULT_SOURCE /* usleep */
- #define _BSD_SOURCE /* usleep */
- #endif
- #ifdef _WIN32
-Index: alljoyn-core/alljoyn_c/samples/secure/DeskTopSharedKSClientC.c
-===================================================================
---- alljoyn-core.orig/alljoyn_c/samples/secure/DeskTopSharedKSClientC.c 2016-05-14 11:29:48.000000000 +0200
-+++ alljoyn-core/alljoyn_c/samples/secure/DeskTopSharedKSClientC.c 2016-05-14 11:30:22.000000000 +0200
-@@ -22,6 +22,7 @@
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- ******************************************************************************/
- #ifndef _WIN32
-+#define _DEFAULT_SOURCE /* usleep */
- #define _BSD_SOURCE /* usleep */
- #endif
- #include <alljoyn_c/AjAPI.h>
-Index: alljoyn-core/alljoyn_c/test/bbcclient.c
-===================================================================
---- alljoyn-core.orig/alljoyn_c/test/bbcclient.c 2016-05-14 11:29:48.000000000 +0200
-+++ alljoyn-core/alljoyn_c/test/bbcclient.c 2016-05-14 11:30:27.000000000 +0200
-@@ -14,6 +14,7 @@
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- ******************************************************************************/
- #ifndef _WIN32
-+#define _DEFAULT_SOURCE /* usleep */
- #define _BSD_SOURCE /* usleep */
- #endif
- #include <alljoyn_c/AjAPI.h>
-Index: alljoyn-core/alljoyn_c/test/bbcservice.c
-===================================================================
---- alljoyn-core.orig/alljoyn_c/test/bbcservice.c 2016-05-14 11:29:48.000000000 +0200
-+++ alljoyn-core/alljoyn_c/test/bbcservice.c 2016-05-14 11:30:30.000000000 +0200
-@@ -14,6 +14,7 @@
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- ******************************************************************************/
- #ifndef _WIN32
-+#define _DEFAULT_SOURCE /* usleep */
- #define _BSD_SOURCE /* usleep */
- #endif
- #include <alljoyn_c/AjAPI.h>
diff --git a/debian/old/patches/series b/debian/old/patches/series
deleted file mode 100644
index e8f670d..0000000
--- a/debian/old/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-soname.patch
-add-clean-target.patch
-remove-bsd-source.patch
-hardening.patch
diff --git a/debian/patches/no-bsymbolic.patch b/debian/patches/no-bsymbolic.patch
new file mode 100644
index 0000000..d1001c5
--- /dev/null
+++ b/debian/patches/no-bsymbolic.patch
@@ -0,0 +1,89 @@
+Author: Thorsten Alteholz <debian at alteholz.de>
+Description: scons automatically add '-Wl,-Bsymbolic' which results in
+ segmentation faults for Debug-calls
+ so better don't use that linker option
+Index: alljoyn-services-1504/config/cpp/SConscript
+===================================================================
+--- alljoyn-services-1504.orig/config/cpp/SConscript 2016-06-24 08:30:35.000000000 +0200
++++ alljoyn-services-1504/config/cpp/SConscript 2016-06-24 08:37:34.000000000 +0200
+@@ -25,6 +25,7 @@
+ config_env.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
+ config_env.Append(CFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ config_env.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
++ config_env['SHLIBVERSIONFLAGS'] = " "
+
+ # Make config dist a sub-directory of the alljoyn dist. This avoids any conflicts with alljoyn dist targets.
+ config_env['CONFIG_DISTDIR'] = config_env['DISTDIR'] + '/config'
+Index: alljoyn-services-1504/controlpanel/cpp/SConscript
+===================================================================
+--- alljoyn-services-1504.orig/controlpanel/cpp/SConscript 2016-06-24 08:30:35.000000000 +0200
++++ alljoyn-services-1504/controlpanel/cpp/SConscript 2016-06-24 08:38:38.000000000 +0200
+@@ -25,6 +25,7 @@
+ cpsenv.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
+ cpsenv.Append(CFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ cpsenv.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
++ cpsenv['SHLIBVERSIONFLAGS'] = " "
+
+ cpsenv['CPS_DISTDIR'] = cpsenv['DISTDIR'] + '/controlpanel'
+
+Index: alljoyn-services-1504/notification/cpp/SConscript
+===================================================================
+--- alljoyn-services-1504.orig/notification/cpp/SConscript 2016-06-24 08:30:35.000000000 +0200
++++ alljoyn-services-1504/notification/cpp/SConscript 2016-06-24 08:38:26.000000000 +0200
+@@ -25,6 +25,7 @@
+ nsenv.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
+ nsenv.Append(CFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ nsenv.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
++ nsenv['SHLIBVERSIONFLAGS'] = " "
+
+ nsenv['NS_DISTDIR'] = nsenv['DISTDIR'] + '/notification'
+
+Index: alljoyn-services-1504/onboarding/cpp/SConscript
+===================================================================
+--- alljoyn-services-1504.orig/onboarding/cpp/SConscript 2016-06-24 08:30:35.000000000 +0200
++++ alljoyn-services-1504/onboarding/cpp/SConscript 2016-06-24 08:37:22.000000000 +0200
+@@ -26,6 +26,7 @@
+ onb_env.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
+ onb_env.Append(CFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ onb_env.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
++ onb_env['SHLIBVERSIONFLAGS'] = " "
+
+ # Make onboarding dist a sub-directory of the alljoyn dist. This avoids any conflicts with alljoyn dist targets.
+ onb_env['ONBOARDING_DISTDIR'] = onb_env['DISTDIR'] + '/onboarding'
+Index: alljoyn-services-1504/sample_apps/cpp/SConscript
+===================================================================
+--- alljoyn-services-1504.orig/sample_apps/cpp/SConscript 2016-06-24 08:30:35.000000000 +0200
++++ alljoyn-services-1504/sample_apps/cpp/SConscript 2016-06-24 08:38:10.000000000 +0200
+@@ -26,7 +26,7 @@
+ server_sample_env.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
+ server_sample_env.Append(CFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ server_sample_env.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+-
++ server_sample_env['SHLIBVERSIONFLAGS'] = " "
+
+ # Make serversample dist a sub-directory of the alljoyn dist. This avoids any conflicts with alljoyn dist targets.
+ server_sample_env['SAMPLE_APPS_DISTDIR'] = server_sample_env['DISTDIR'] + '/sample_apps'
+Index: alljoyn-services-1504/services_common/cpp/SConscript
+===================================================================
+--- alljoyn-services-1504.orig/services_common/cpp/SConscript 2016-06-24 08:30:35.000000000 +0200
++++ alljoyn-services-1504/services_common/cpp/SConscript 2016-06-24 08:36:57.000000000 +0200
+@@ -23,6 +23,7 @@
+ services_common_env.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
+ services_common_env.Append(CFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ services_common_env.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
++ services_common_env['SHLIBVERSIONFLAGS'] = " "
+
+
+ services_common_env['SC_DISTDIR'] = services_common_env['DISTDIR'] + '/services_common'
+Index: alljoyn-services-1504/time/cpp/SConscript
+===================================================================
+--- alljoyn-services-1504.orig/time/cpp/SConscript 2016-06-24 08:30:35.000000000 +0200
++++ alljoyn-services-1504/time/cpp/SConscript 2016-06-24 08:37:51.000000000 +0200
+@@ -24,6 +24,7 @@
+ tsenv.Append(LINKFLAGS = ['-fPIE', '-pie', '-fPIC'])
+ tsenv.Append(CFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
+ tsenv.Append(CPPFLAGS = ['-fPIE', '-fPIC', '-D_FORTIFY_SOURCE=2'])
++ tsenv['SHLIBVERSIONFLAGS'] = " "
+
+ tsenv['TS_DISTDIR'] = tsenv['DISTDIR'] + '/time'
+
diff --git a/debian/patches/series b/debian/patches/series
index ae44c7d..78b7e3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ soname.patch
add-linux-pthread.patch
hardening.patch
spelling.patch
+no-bsymbolic.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/alljoyn-services-1504.git
More information about the Debian-iot-packaging
mailing list