Bug#646456: singular: diff for NMU version 3-0-4-3.dfsg-3.2

[gregor herrmann]

tags 558958 + patch
tags 558958 + pending
tags 641572 + pending
tags 646456 + pending
thanks

Dear maintainer,

Mònica has prepared an NMU for singular (versioned as 3-0-4-3.dfsg-3.2)
and I've uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    NP: Leonard Cohen: Tonight Will Be Fine

diff -u singular-3-0-4-3.dfsg/debian/changelog singular-3-0-4-3.dfsg/debian/changelog
--- singular-3-0-4-3.dfsg/debian/changelog
+++ singular-3-0-4-3.dfsg/debian/changelog
@@ -1,3 +1,15 @@
+singular (3-0-4-3.dfsg-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * add.format.arguments.patch: Add format arguments (Closes: #646456).
+  * link-libdl.patch:
+      - Fix FTBFS with ld --as-needed. Thanks to Matthias Klose.
+        (Closes: #641572) (LP: #832790)
+      - Resolve unresolved symbols in shared libraries. Thanks to Matthias Klose.
+        (Closes: #558958)
+
+ -- Mònica Ramírez Arceda <mon...@probeta.net>  Sat, 03 Dec 2011 20:23:04 +0100
+
 singular (3-0-4-3.dfsg-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u singular-3-0-4-3.dfsg/debian/patches/series singular-3-0-4-3.dfsg/debian/patches/series
--- singular-3-0-4-3.dfsg/debian/patches/series
+++ singular-3-0-4-3.dfsg/debian/patches/series
@@ -4,0 +5,2 @@
+link-libdl.patch
+add.format.arguments.patch
only in patch2:
unchanged:
--- singular-3-0-4-3.dfsg.orig/debian/patches/link-libdl.patch
+++ singular-3-0-4-3.dfsg/debian/patches/link-libdl.patch
@@ -0,0 +1,40 @@
+--- a/Singular/Makefile.in	2011-09-13 17:05:18.346535542 +0000
++++ b/Singular/Makefile.in	2011-09-13 16:58:30.000000000 +0000
+@@ -343,13 +343,13 @@
+ 	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} \
+ 	  -o Singular${S_EXT} \
+ 	  tesths.cc iparith.o mpsr_Tok.o claptmpl.o\
+-	  ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
++	  ${OBJS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} ../kernel/mmalloc.o
+ 
+ libsingular: mod2.h Makefile version.h $(WIN_LIBS) scanner.cc  ${OBJS} \
+          iparith.o libsingular-tesths.o libparse.cc claptmpl.o mpsr_Tok.o $(DL_LIBS) 
+ 	$(LIBSINGULAR_LD) ${SLDFLAGS} ${LIBSINGULAR_FLAGS} -o ${LIBSINGULAR_NAME} \
+ 	libsingular-tesths.o iparith.o mpsr_Tok.o claptmpl.o \
+-	${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS}
++	${OBJS} -lkernel -L../kernel -L../factory -L../libfac -L${libdir} ${LIBSINGULAR_LIBS} -ldl
+ 	if [ $(LIBSINGULAR_NAME) != libsingular.$(SO_SUFFIX) ]; then \
+ 		ln -s $(LIBSINGULAR_NAME) libsingular.$(SO_SUFFIX); \
+ 	fi
+@@ -393,7 +393,7 @@
+                           ipconv.cc tok.h mpsr_Tok.cc grammar.h mod2.h
+ 	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} -DGENTABLE \
+ 	     -o gentable claptmpl.o iparith.cc tesths.cc mpsr_Tok.cc \
+-	     ${OBJS} ${LDFLAGS} ${LIBS} ../kernel/mmalloc.o
++	     ${OBJS} ${LDFLAGS} ${LIBS} ${LD_DYN_FLAGS} ../kernel/mmalloc.o
+ 	./gentable
+ 	/bin/rm -f gentable gentable.exe
+ 
+@@ -714,10 +714,10 @@
+ 	${LD_DYN_FLAGS} ${LD_LIBC}
+ 
+ iparith.og: iparith.inc iparith.cc
+-	$(CXXG)  ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -c iparith.cc -o iparith.og
++	$(CXXG)  ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -c iparith.cc -o iparith.og ${LD_DYN_FLAGS}
+ 
+ mpsr_Tok.og: iparith.inc mpsr_Tok.cc
+-	$(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og
++	$(CXXG) ${CXXFLAGSG} ${CPPFLAGS} ${CXXTEMPLFLAGSG} ${DEFSG} -c mpsr_Tok.cc -o mpsr_Tok.og ${LD_DYN_FLAGS}
+ 
+ installg: Singularg
+ 	${MKINSTALLDIRS} ${bindir}
only in patch2:
unchanged:
--- singular-3-0-4-3.dfsg.orig/debian/patches/add.format.arguments.patch
+++ singular-3-0-4-3.dfsg/debian/patches/add.format.arguments.patch
@@ -0,0 +1,37 @@
+Description: Add format arguments to avoid format-security error.
+Author: Mònica Ramírez Arceda <mon...@probeta.net>
+Last-Update: 2011-12-03
+
+--- a/Singular/feOpt.cc
++++ b/Singular/feOpt.cc
+@@ -381,7 +381,7 @@
+         return NULL;
+ 
+       case FE_OPT_VERSION:
+-        printf(versionString());
++        printf("%s",versionString());
+         return NULL;
+ 
+ #ifdef HAVE_TCL
+--- a/kernel/feread.cc
++++ b/kernel/feread.cc
+@@ -305,7 +305,7 @@
+ {
+   if (BVERBOSE(V_PROMPT))
+   {
+-    fprintf(stdout,pr);
++    fprintf(stdout,"%s",pr);
+ #ifdef DEFECT_SINGULAR
+     fprintf(stdout,"\n");
+ #endif
+--- a/kernel/mpr_complex.cc
++++ b/kernel/mpr_complex.cc
+@@ -665,7 +665,7 @@
+       else // (-i*43) or (i*34)
+       {
+         if (c.imag().isOne())
+-          sprintf(out,currRing->parameter[0]);
++          sprintf(out,"%s",currRing->parameter[0]);
+         else if (c.imag().isMOne())
+           sprintf(out,"-%s",currRing->parameter[0]);
+         else

signature.asc
Description: Digital signature