Your message dated Fri, 13 Jan 2012 03:03:46 +0800
with message-id
<CAMr=8w4QRRiTphuda1=jssgvaof5o0jjezgfqcacbxfouzx...@mail.gmail.com>
and subject line Close old nmu diff bug
has caused the Debian Bug report #630394,
regarding axis2c: diff for NMU version 1.6.0-2.1
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 [email protected]
immediately.)
--
630394: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630394
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: axis2c
Version: 1.6.0-2
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for axis2c (versioned as 1.6.0-2.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Cheers
Luk
diff -Nru axis2c-1.6.0/debian/changelog axis2c-1.6.0/debian/changelog
--- axis2c-1.6.0/debian/changelog 2010-10-22 20:53:35.000000000 +0200
+++ axis2c-1.6.0/debian/changelog 2011-06-13 18:46:36.000000000 +0200
@@ -1,3 +1,13 @@
+axis2c (1.6.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Empty dependency_libs (Closes: #621260).
+ * Fix FTBFS with --no-ad-needed (Closes: #604791).
+ * Fix warning with upstream's patch (Closes: #616291).
+ * Use uri instead of clone (Closes: #626693).
+
+ -- Luk Claes <[email protected]> Mon, 13 Jun 2011 18:46:04 +0200
+
axis2c (1.6.0-2) unstable; urgency=low
* Fix patches/03_enable-security to enable both security
diff -Nru axis2c-1.6.0/debian/libapache2-mod-axis2c.lintian-overrides axis2c-1.6.0/debian/libapache2-mod-axis2c.lintian-overrides
--- axis2c-1.6.0/debian/libapache2-mod-axis2c.lintian-overrides 2010-02-19 02:52:14.000000000 +0100
+++ axis2c-1.6.0/debian/libapache2-mod-axis2c.lintian-overrides 2011-06-13 19:21:51.000000000 +0200
@@ -1,4 +1,4 @@
-binary-or-shlib-defines-rpath ./usr/lib/apache2/modules/addressing/libaxis2_mod_addr.so.0.6.0 /usr/lib/axis2/lib
-binary-or-shlib-defines-rpath ./usr/lib/apache2/modules/libmod_axis2.so.0.6.0 /usr/lib/axis2/lib
-binary-or-shlib-defines-rpath ./usr/lib/apache2/modules/logging/libaxis2_mod_log.so.0.6.0 /usr/lib/axis2/lib
+binary-or-shlib-defines-rpath usr/lib/apache2/modules/addressing/libaxis2_mod_addr.so.0.6.0 /usr/lib/axis2/lib
+binary-or-shlib-defines-rpath usr/lib/apache2/modules/libmod_axis2.so.0.6.0 /usr/lib/axis2/lib
+binary-or-shlib-defines-rpath usr/lib/apache2/modules/logging/libaxis2_mod_log.so.0.6.0 /usr/lib/axis2/lib
diff -Nru axis2c-1.6.0/debian/libaxis2c-bin.lintian-overrides axis2c-1.6.0/debian/libaxis2c-bin.lintian-overrides
--- axis2c-1.6.0/debian/libaxis2c-bin.lintian-overrides 2010-02-19 02:52:14.000000000 +0100
+++ axis2c-1.6.0/debian/libaxis2c-bin.lintian-overrides 2011-06-13 19:22:09.000000000 +0200
@@ -1,3 +1,2 @@
-
-binary-or-shlib-defines-rpath ./usr/lib/axis2/bin/axis2_http_server /usr/lib/axis2/lib
+binary-or-shlib-defines-rpath usr/lib/axis2/bin/axis2_http_server /usr/lib/axis2/lib
diff -Nru axis2c-1.6.0/debian/patches/06-ld-no-as-needed.patch axis2c-1.6.0/debian/patches/06-ld-no-as-needed.patch
--- axis2c-1.6.0/debian/patches/06-ld-no-as-needed.patch 1970-01-01 01:00:00.000000000 +0100
+++ axis2c-1.6.0/debian/patches/06-ld-no-as-needed.patch 2011-06-13 18:36:58.000000000 +0200
@@ -0,0 +1,56 @@
+--- axis2c-1.6.0-orig/axiom/test/util/Makefile.am 2009-04-05 22:48:14.000000000 -0600
++++ axis2c-1.6.0-new/axiom/test/util/Makefile.am 2010-07-16 11:44:25.000000000 -0600
+@@ -1,7 +1,9 @@
+ noinst_PROGRAMS = axiom
+ axiom_SOURCES = axiom_util_test.c
+ axiom_LDADD = \
+- $(top_builddir)/src/om/libaxis2_axiom.la
++ $(top_builddir)/src/om/libaxis2_axiom.la \
++ $(top_builddir)/src/parser/guththila/libaxis2_parser.la \
++ $(top_builddir)/../util/src/libaxutil.la
+
+ INCLUDES = -I$(top_builddir)/include \
+ -I ../../../util/include \
+--- axis2c-1.6.0-orig/axiom/test/util/axiom_util_test.c 2010-07-16 12:03:37.000000000 -0600
++++ axis2c-1.6.0-new/axiom/test/util/axiom_util_test.c 2010-07-16 12:04:12.000000000 -0600
+@@ -3,6 +3,8 @@
+ #include <axiom.h>
+ #include <axis2_util.h>
+ #include <axiom_node.h>
++#include <axiom_xml_reader.h> /* FIXME */
++
+ #include "../../../util/test/util/create_env.h"
+ FILE *f = NULL;
+ axiom_node_t *node = NULL;
+--- axis2c-1.6.0-orig/neethi/test/Makefile.am 2009-04-05 22:46:59.000000000 -0600
++++ axis2c-1.6.0-new/neethi/test/Makefile.am 2010-07-16 11:50:08.000000000 -0600
+@@ -12,5 +12,6 @@
+
+ test_LDADD = $(top_builddir)/src/libneethi.la \
+ ../../axiom/src/om/libaxis2_axiom.la \
++ ../../axiom/src/parser/guththila/libaxis2_parser.la \
+ ../../util/src/libaxutil.la \
+ ../src/libneethi.la
+--- ./neethi/test/Makefile.in~ 2009-04-17 08:15:28.000000000 +0200
++++ ./neethi/test/Makefile.in 2010-10-07 16:33:06.232108405 +0200
+@@ -187,6 +187,7 @@
+
+ test_LDADD = $(top_builddir)/src/libneethi.la \
+ ../../axiom/src/om/libaxis2_axiom.la \
++ ../../axiom/src/parser/guththila/libaxis2_parser.la \
+ ../../util/src/libaxutil.la \
+ ../src/libneethi.la
+
+--- ./axiom/test/util/Makefile.in~ 2009-04-17 08:15:23.000000000 +0200
++++ ./axiom/test/util/Makefile.in 2010-10-07 16:32:04.289608905 +0200
+@@ -184,7 +184,9 @@
+ top_srcdir = @top_srcdir@
+ axiom_SOURCES = axiom_util_test.c
+ axiom_LDADD = \
+- $(top_builddir)/src/om/libaxis2_axiom.la
++ $(top_builddir)/src/om/libaxis2_axiom.la \
++ $(top_builddir)/src/parser/guththila/libaxis2_parser.la \
++ $(top_builddir)/../util/src/libaxutil.la \
+
+ INCLUDES = -I$(top_builddir)/include \
+ -I ../../../util/include \
diff -Nru axis2c-1.6.0/debian/patches/07-ssl-method-cast.patch axis2c-1.6.0/debian/patches/07-ssl-method-cast.patch
--- axis2c-1.6.0/debian/patches/07-ssl-method-cast.patch 1970-01-01 01:00:00.000000000 +0100
+++ axis2c-1.6.0/debian/patches/07-ssl-method-cast.patch 2011-06-13 18:42:51.000000000 +0200
@@ -0,0 +1,11 @@
+--- trunk/src/core/transport/http/sender/ssl/ssl_utils.c (revision 918421)
++++ trunk/src/core/transport/http/sender/ssl/ssl_utils.c (revision 918422)
+@@ -62,7 +62,7 @@
+ }
+
+ /* Create our context */
+- meth = SSLv23_method();
++ meth = (SSL_METHOD*)SSLv23_method();
+ ctx = SSL_CTX_new(meth);
+
+ /* Load our keys and certificates
diff -Nru axis2c-1.6.0/debian/patches/08-uri-use-after-free.patch axis2c-1.6.0/debian/patches/08-uri-use-after-free.patch
--- axis2c-1.6.0/debian/patches/08-uri-use-after-free.patch 1970-01-01 01:00:00.000000000 +0100
+++ axis2c-1.6.0/debian/patches/08-uri-use-after-free.patch 2011-06-13 18:45:45.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Fix use after free in uri_test
+Origin: backport, http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/test/uri/uri_test.c#rev961590
+Bug-Ubuntu: https://launchpad.net/bugs/600174
+Applied-Upstream: 1.7.0
+Last-Update: 2011-05-14
+
+Index: axis2c-1.6.0/util/test/uri/uri_test.c
+===================================================================
+--- axis2c-1.6.0.orig/util/test/uri/uri_test.c 2011-03-08 16:43:28.988346623 +0200
++++ axis2c-1.6.0/util/test/uri/uri_test.c 2011-03-08 16:43:23.020317033 +0200
+@@ -72,7 +72,7 @@
+ printf("Test clone failed");
+ }
+
+- rel = axutil_uri_resolve_relative(env,base,clone);
++ rel = axutil_uri_resolve_relative(env,base,uri);
+ if(rel)
+ {
+ printf("The resolved relative uri is %s\n",axutil_uri_to_string(rel,env,0));
diff -Nru axis2c-1.6.0/debian/patches/debian-changes-1.6.0-2.1 axis2c-1.6.0/debian/patches/debian-changes-1.6.0-2.1
--- axis2c-1.6.0/debian/patches/debian-changes-1.6.0-2.1 1970-01-01 01:00:00.000000000 +0100
+++ axis2c-1.6.0/debian/patches/debian-changes-1.6.0-2.1 2011-06-13 19:46:45.000000000 +0200
@@ -0,0 +1,72 @@
+Description: Upstream changes introduced in version 1.6.0-2.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ axis2c (1.6.0-2.1) unstable; urgency=medium
+ .
+ * Non-maintainer upload.
+ * Empty dependency_libs (Closes: #621260).
+ * Fix FTBFS with --no-ad-needed (Closes: #604791).
+ * Fix warning with upstream's patch (Closes: #616291).
+ * Use uri instead of clone (Closes: #626693).
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Luk Claes <[email protected]>
+Bug-Debian: http://bugs.debian.org/604791
+Bug-Debian: http://bugs.debian.org/616291
+Bug-Debian: http://bugs.debian.org/621260
+Bug-Debian: http://bugs.debian.org/626693
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ axis2c-1.6.0/util/test/util/axis2.log
+@@ -0,0 +1,18 @@
++[Mon Jun 13 19:10:58 2011] [debug] test_log.c(80) log_debug test foo 1
++[Mon Jun 13 19:10:58 2011] [info] log_info test foo 1
++[Mon Jun 13 19:10:58 2011] [warning] test_log.c(122) log_warning test foo 1
++[Mon Jun 13 19:10:58 2011] [error] test_log.c(145) log_error test foo 1
++[Mon Jun 13 19:10:58 2011] [critical] test_log.c(155) log_critical test foo 1
++[Mon Jun 13 19:10:58 2011] [info] No files in the path /tmp/test/.
++[Mon Jun 13 19:27:48 2011] [debug] test_log.c(80) log_debug test foo 1
++[Mon Jun 13 19:27:48 2011] [info] log_info test foo 1
++[Mon Jun 13 19:27:48 2011] [warning] test_log.c(122) log_warning test foo 1
++[Mon Jun 13 19:27:48 2011] [error] test_log.c(145) log_error test foo 1
++[Mon Jun 13 19:27:48 2011] [critical] test_log.c(155) log_critical test foo 1
++[Mon Jun 13 19:27:48 2011] [info] No files in the path /tmp/test/.
++[Mon Jun 13 19:40:18 2011] [debug] test_log.c(80) log_debug test foo 1
++[Mon Jun 13 19:40:18 2011] [info] log_info test foo 1
++[Mon Jun 13 19:40:18 2011] [warning] test_log.c(122) log_warning test foo 1
++[Mon Jun 13 19:40:18 2011] [error] test_log.c(145) log_error test foo 1
++[Mon Jun 13 19:40:18 2011] [critical] test_log.c(155) log_critical test foo 1
++[Mon Jun 13 19:40:18 2011] [info] No files in the path /tmp/test/.
+--- /dev/null
++++ axis2c-1.6.0/axiom/test/soap/test_soap.log
+@@ -0,0 +1,15 @@
++[Mon Jun 13 19:10:59 2011] [debug] soap_builder.c(945) identified soap version is soap12
++[Mon Jun 13 19:10:59 2011] [debug] soap_fault_sub_code.c(230) error tring to set fault subcode value more than once
++[Mon Jun 13 19:10:59 2011] [debug] soap_fault_sub_code.c(188) error tring to set fault subcode more than once
++[Mon Jun 13 19:10:59 2011] [debug] soap_fault_sub_code.c(230) error tring to set fault subcode value more than once
++[Mon Jun 13 19:10:59 2011] [debug] soap_fault.c(396) tring to set soap_fault detail more than once
++[Mon Jun 13 19:27:49 2011] [debug] soap_builder.c(945) identified soap version is soap12
++[Mon Jun 13 19:27:49 2011] [debug] soap_fault_sub_code.c(230) error tring to set fault subcode value more than once
++[Mon Jun 13 19:27:49 2011] [debug] soap_fault_sub_code.c(188) error tring to set fault subcode more than once
++[Mon Jun 13 19:27:49 2011] [debug] soap_fault_sub_code.c(230) error tring to set fault subcode value more than once
++[Mon Jun 13 19:27:49 2011] [debug] soap_fault.c(396) tring to set soap_fault detail more than once
++[Mon Jun 13 19:40:19 2011] [debug] soap_builder.c(945) identified soap version is soap12
++[Mon Jun 13 19:40:19 2011] [debug] soap_fault_sub_code.c(230) error tring to set fault subcode value more than once
++[Mon Jun 13 19:40:19 2011] [debug] soap_fault_sub_code.c(188) error tring to set fault subcode more than once
++[Mon Jun 13 19:40:19 2011] [debug] soap_fault_sub_code.c(230) error tring to set fault subcode value more than once
++[Mon Jun 13 19:40:19 2011] [debug] soap_fault.c(396) tring to set soap_fault detail more than once
diff -Nru axis2c-1.6.0/debian/patches/series axis2c-1.6.0/debian/patches/series
--- axis2c-1.6.0/debian/patches/series 2010-02-19 02:52:14.000000000 +0100
+++ axis2c-1.6.0/debian/patches/series 2011-06-13 19:23:33.000000000 +0200
@@ -3,3 +3,7 @@
04_fix_testsuite.patch
#build-without-threading.patch
05-build-without-threading.patch
+06-ld-no-as-needed.patch
+07-ssl-method-cast.patch
+08-uri-use-after-free.patch
+debian-changes-1.6.0-2.1
diff -Nru axis2c-1.6.0/debian/rules axis2c-1.6.0/debian/rules
--- axis2c-1.6.0/debian/rules 2010-10-22 20:53:35.000000000 +0200
+++ axis2c-1.6.0/debian/rules 2011-06-13 19:35:55.000000000 +0200
@@ -11,6 +11,7 @@
binary-install/libaxis2c0::
cd debian/$(cdbs_curpkg)/usr/lib; for x in axis2/lib/*.so*; do ln -s $$x; done
+ sed -i "/dependency_libs/ s/'.*'/''/" `find debian/$(cdbs_curpkg) -name '*.la'`
binary-install/libaxis2c-dev::
mkdir -p debian/$(cdbs_curpkg)/usr/lib/axis2/include/axis2-1.6.0
@@ -19,8 +20,8 @@
chmod +x debian/$(cdbs_curpkg)/usr/lib/axis2/bin/tools/wsdl2c/WSDL2C.sh
binary-install/libapache2-mod-axis2c::
- sed -i "s/\(libdir=.*\)axis2/\1apache2/g" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/addressing/libaxis2_mod_addr.la
- sed -i "s/\(libdir=.*\)axis2/\1apache2/g" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/logging/libaxis2_mod_log.la
+ sed -i -e "s/\(libdir=.*\)axis2/\1apache2/g" -e "/dependency_libs/ s/'.*'/''/" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/addressing/libaxis2_mod_addr.la
+ sed -i -e "s/\(libdir=.*\)axis2/\1apache2/g" -e "/dependency_libs/ s/'.*'/''/" debian/$(cdbs_curpkg)/usr/lib/apache2/modules/logging/libaxis2_mod_log.la
clean::
find . -name Makefile -print0 | xargs -0 rm || /bin/true
--- End Message ---
--- Begin Message ---
As I am doing another NMU to address various issues with this package
(most importantly FTBFS), I believe this old nmu diff bug can be
closed.
--
Regards,
Aron Xu
--- End Message ---
