[med-svn] [fis-gtm] 01/02: Fix lintian warnings and drop OpenSSL plugin libraries
Amul Shah
tuskentower-guest at moszumanska.debian.org
Sat Oct 4 23:15:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
tuskentower-guest pushed a commit to branch master
in repository fis-gtm.
commit 5aa359de08263793ae6988a147dc64341ee3beb3
Author: Amul Shah <Amul.Shah at fisglobal.com>
Date: Sat Oct 4 19:05:37 2014 -0400
Fix lintian warnings and drop OpenSSL plugin libraries
Building the reference encryption plugins that dynamically link to the OpenSSL
libraries apparently creates a licensing conflict where none exists.
Temporarily remove these two plugins from the build until we resolve this
apparent licensing conflict.
Eliminate remaining lintian warnings.
---
debian/patches/series | 1 +
debian/patches/upstream_build_all_encryption_libs | 45 ++++++++++----------
debian/patches/upstream_fix_speeling_errors | 50 +++++++++++++++++++++++
debian/rules | 1 -
4 files changed, 75 insertions(+), 22 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 13650ac..03d3f67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream_fix_speeling_errors
upstream_build_all_encryption_libs
diff --git a/debian/patches/upstream_build_all_encryption_libs b/debian/patches/upstream_build_all_encryption_libs
index 1053acc..a333826 100644
--- a/debian/patches/upstream_build_all_encryption_libs
+++ b/debian/patches/upstream_build_all_encryption_libs
@@ -6,7 +6,10 @@ Description: The upstream V6.2-000 CMakeLists.txt file built only one of three
possible encryption plugin libraries. This meant that the debian fis-gtm
package was missing a core piece of the distributed binaries. Upstream will
apply this change to the next release after internal review.
-Last-Update: 2014-09-29
+ UPDATE: Do not build the reference encryption plugins because dynamically
+ linking to OpenSSL creates a licensing conflict between OpenSSL's license and
+ the AGPL.
+Last-Update: 2014-10-04
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,8 +46,10 @@ Last-Update: 2014-09-29
+set_target_properties(libgtmcrypt_gcrypt_AES256CFB.so PROPERTIES
+ OUTPUT_NAME gtmcrypt_gcrypt_AES256CFB
+ COMPILE_DEFINITIONS "USE_GCRYPT -DUSE_AES256CFB"
-+ LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
-+ )
+ LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
+ )
+-target_link_libraries(libgtmcrypt ${GPG_LIBRARIES})
+-install(TARGETS libgtmcrypt DESTINATION ${GTM_INSTALL_DIR}/plugin)
+target_link_libraries(libgtmcrypt_gcrypt_AES256CFB.so ${GPG_LIBRARIES})
+install(TARGETS libgtmcrypt_gcrypt_AES256CFB.so DESTINATION ${GTM_INSTALL_DIR}/plugin)
+
@@ -61,26 +66,24 @@ Last-Update: 2014-09-29
+install(FILES ${default_encr_link} DESTINATION ${GTM_INSTALL_DIR}/plugin)
+
+# Library=OPENSSL Algorithm=AES256CFB
-+add_library(libgtmcrypt_openssl_AES256CFB MODULE ${libgtmcrypt_SOURCES})
-+set_target_properties(libgtmcrypt_openssl_AES256CFB PROPERTIES
-+ OUTPUT_NAME gtmcrypt_openssl_AES256CFB
-+ COMPILE_DEFINITIONS "USE_OPENSSL -DUSE_AES256CFB"
-+ LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
-+ )
-+target_link_libraries(libgtmcrypt_openssl_AES256CFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
-+install(TARGETS libgtmcrypt_openssl_AES256CFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
++#add_library(libgtmcrypt_openssl_AES256CFB MODULE ${libgtmcrypt_SOURCES})
++#set_target_properties(libgtmcrypt_openssl_AES256CFB PROPERTIES
++# OUTPUT_NAME gtmcrypt_openssl_AES256CFB
++# COMPILE_DEFINITIONS "USE_OPENSSL -DUSE_AES256CFB"
++# LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
++# )
++#target_link_libraries(libgtmcrypt_openssl_AES256CFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
++#install(TARGETS libgtmcrypt_openssl_AES256CFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
+
+# Library=OPENSSL Algorithm=BLOWFISHCFB
-+add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES})
-+set_target_properties(libgtmcrypt_openssl_BLOWFISHCFB PROPERTIES
-+ OUTPUT_NAME gtmcrypt_openssl_BLOWFISHCFB
-+ COMPILE_DEFINITIONS "USE_OPENSSL -DUSE_BLOWFISHCFB"
- LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
- )
--target_link_libraries(libgtmcrypt ${GPG_LIBRARIES})
--install(TARGETS libgtmcrypt DESTINATION ${GTM_INSTALL_DIR}/plugin)
-+target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
-+install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
++#add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES})
++#set_target_properties(libgtmcrypt_openssl_BLOWFISHCFB PROPERTIES
++# OUTPUT_NAME gtmcrypt_openssl_BLOWFISHCFB
++# COMPILE_DEFINITIONS "USE_OPENSSL -DUSE_BLOWFISHCFB"
++# LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
++# )
++#target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
++#install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
add_library(libgtmtls MODULE ${libgtmtls_SOURCES})
set_target_properties(libgtmtls PROPERTIES
diff --git a/debian/patches/upstream_fix_speeling_errors b/debian/patches/upstream_fix_speeling_errors
new file mode 100644
index 0000000..984196c
--- /dev/null
+++ b/debian/patches/upstream_fix_speeling_errors
@@ -0,0 +1,50 @@
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Forwarded: not-needed
+Summary: Fix spelling errors in errors messages and MUMPS source routines
+Description: Upstream sources contain spelling errors in one message for the
+ DSE utility program. This is now fixed to avoid the lintian warning
+ spelling-error-in-binary. MUMPS sources are now compiled with -embed_source
+ which embeds the source in the object file. Comments in two MUMPS routines
+ contained spelling errors. These are now fixed to avoid the lintian warning
+ spelling-error-in-binary.
+Applied-Upstream: V6.2-001
+Last-Update: 2014-10-04
+
+--- a/sr_port/dse_shift.c
++++ b/sr_port/dse_shift.c
+@@ -128,7 +128,7 @@
+ {
+ if (shift + size >= cs_addrs->hdr->blk_size)
+ {
+- util_out_print("Error: block not large enough to accomodate shift.", TRUE);
++ util_out_print("Error: block not large enough to accommodate shift.", TRUE);
+ t_abort(gv_cur_region, cs_addrs);
+ if (lbp)
+ free(lbp);
+--- a/sr_port/rsel.mpt
++++ b/sr_port/rsel.mpt
+@@ -121,11 +121,11 @@
+ s end=$p(r,":",2),beg=$p(r,":"),rdf=0
+ i end=beg!'$l(end) q:'$l(beg) s stop=last ; if all stripped out, done
+ s:'$l(beg) beg="*" s pct=$e(beg) ; CAUTION: ELSE on next line
+- e s strt=$$mask(beg),stop=$$mask(end) i $l($p(stop,"$")) q:stop']strt ; if end before begining, done
++ e s strt=$$mask(beg),stop=$$mask(end) i $l($p(stop,"$")) q:stop']strt ; if end before beginning, done
+ i "*?"[pct s mtch="%*" d start(1) f s r=$$search(1) q:r]stop!'$l(r) d save ; if alls, get _files first
+ s pct=pct="%",mtch=beg
+ d start(pct)
+- f s r=$$search(pct) q:r]stop!'$l(r) d save ; do begining
++ f s r=$$search(pct) q:r]stop!'$l(r) d save ; do beginning
+ i stop=last q ; no range - we're done
+ s stop=$p(stop,"$")
+ i $l(stop),stop]$p(strt,"$") d ; if no overlap, do middle
+--- a/sr_port/xcmd.mpt
++++ b/sr_port/xcmd.mpt
+@@ -14,7 +14,7 @@
+ ; If no $ETRAP defined, use CLIERR^%XCMD overriding a potential $ZTRAP error handler
+ if ""=$ETRAP new $ETRAP set $ETRAP="goto CLIERR^%XCMD"
+ new etrap set etrap=$ETRAP
+- ; Protect %XCMD's error handler by NEWing and SETing $ETRAP at the begining of the XECUTEd command
++ ; Protect %XCMD's error handler by NEWing and SETing $ETRAP at the beginning of the XECUTEd command
+ xecute "new $ETRAP set $ETRAP=etrap "_$zcmdline
+ quit
+
diff --git a/debian/rules b/debian/rules
index 5a02347..182b74c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,6 @@ override_dh_fixperms:
override_dh_lintian:
echo "$(BINPKG) binary: shlib-with-executable-stack usr/lib/*/fis-gtm/*/libgtmshr.so" > debian/$(BINPKG).lintian-overrides
echo "$(BINPKG) binary: shared-lib-without-dependency-information usr/lib/*/fis-gtm/*/libgtmutil.so" >> debian/$(BINPKG).lintian-overrides
- echo "$(BINPKG) binary: shared-lib-without-dependency-information usr/lib/*/fis-gtm/*/utf8/libgtmutil.so" >> debian/$(BINPKG).lintian-overrides
echo "# The following permissions are really set intentionally in override_dh_fixpermissions" >> debian/$(BINPKG).lintian-overrides
echo "$(BINPKG): setuid-binary usr/lib/*/fis-gtm/*/gtmsecshrdir/gtmsecshr 4500 root/root" >> debian/$(BINPKG).lintian-overrides
echo "$(BINPKG): executable-is-not-world-readable usr/lib/*/fis-gtm/*/gtmsecshrdir/gtmsecshr 4500" >> debian/$(BINPKG).lintian-overrides
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git
More information about the debian-med-commit
mailing list