diff -Nru libbs2b-3.1.0+dfsg/debian/changelog libbs2b-3.1.0+dfsg/debian/changelog --- libbs2b-3.1.0+dfsg/debian/changelog 2011-07-25 17:43:43.000000000 +0000 +++ libbs2b-3.1.0+dfsg/debian/changelog 2014-10-04 12:27:27.000000000 +0000 @@ -1,3 +1,22 @@ +libbs2b (3.1.0+dfsg-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use dh-autoreconf to update autotools stuff for new ports (Closes: #702090, + #727396). + * Apply patch from Andrew Gainer over at ubuntu to make autoreconf actually + work. + * Apply "format security" warning/error fix from Ilya Barygin. I don't think + it will actually cause a security issue in this context and i'm not sure if + it will cause a FTBFS in debian (apparently it didn't back in 2011) but it's + certainly horrible coding practice to pass a string that is not explicitly + intended to be a format string to the first parameter of a printf so may + as well fix it. (Closes: #646327) + * Remove config.log manually in clean target, it doesn't seem to get removed + automatically in all situations (in particular it was left behind when + retrying a build after configure failed). + + -- Peter Michael Green <[email protected]> Sat, 04 Oct 2014 11:23:37 +0000 + libbs2b (3.1.0+dfsg-2) unstable; urgency=low * Update debian/rules so get-orig-source deletes subdirectories of win32/ diff -Nru libbs2b-3.1.0+dfsg/debian/control libbs2b-3.1.0+dfsg/debian/control --- libbs2b-3.1.0+dfsg/debian/control 2011-07-25 16:03:24.000000000 +0000 +++ libbs2b-3.1.0+dfsg/debian/control 2014-10-04 12:26:16.000000000 +0000 @@ -3,7 +3,7 @@ Section: libs Maintainer: Andrew Gainer <[email protected]> Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 8.1.3), libsndfile1-dev +Build-Depends: debhelper (>= 8.1.3), libsndfile1-dev, dh-autoreconf Homepage: http://bs2b.sourceforge.net/ Vcs-Git: git://git.debian.org/collab-maint/libbs2b.git Vcs-Browser: http://git.debian.org/?p=collab-maint/libbs2b.git;a=summary diff -Nru libbs2b-3.1.0+dfsg/debian/patches/fix-format-security-warning.diff libbs2b-3.1.0+dfsg/debian/patches/fix-format-security-warning.diff --- libbs2b-3.1.0+dfsg/debian/patches/fix-format-security-warning.diff 1970-01-01 00:00:00.000000000 +0000 +++ libbs2b-3.1.0+dfsg/debian/patches/fix-format-security-warning.diff 2014-10-04 12:05:13.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Apply "format security" warning/error fix from Ilya Barygin. + I don't think it will actually cause a security issue in this context and + i'm not sure if it will cause a FTBFS in debian (apparently it didn't back + in 2011) but it's certainly horrible coding practice to pass a string that + is not explicitly intended to be a format string to the first parameter of + a printf so may as well fix it. (Closes: #646327) +Author: Ilya Barygin <[email protected]> +Reviewed-by: Peter Michael Green <[email protected]> +Bug-Debian: https://bugs.debian.org/646327 + +--- libbs2b-3.1.0+dfsg.orig/src/bs2bconvert.c ++++ libbs2b-3.1.0+dfsg/src/bs2bconvert.c +@@ -153,7 +153,7 @@ int main( int argc, char *argv[] ) + if( ( infile = sf_open( infilename, SFM_READ, &sfinfo ) ) == NULL ) + { + printf( "Not able to open input file %s.\n", infilename ); +- printf( sf_strerror( NULL ) ); ++ printf( "%s", sf_strerror( NULL ) ); + return 1; + } + diff -Nru libbs2b-3.1.0+dfsg/debian/patches/missing_math_lib.patch libbs2b-3.1.0+dfsg/debian/patches/missing_math_lib.patch --- libbs2b-3.1.0+dfsg/debian/patches/missing_math_lib.patch 1970-01-01 00:00:00.000000000 +0000 +++ libbs2b-3.1.0+dfsg/debian/patches/missing_math_lib.patch 2014-10-04 12:26:16.000000000 +0000 @@ -0,0 +1,29 @@ +Index: libbs2b-3.1.0+dfsg/src/Makefile.am +=================================================================== +--- libbs2b-3.1.0+dfsg.orig/src/Makefile.am 2009-03-20 10:13:53.000000000 -0400 ++++ libbs2b-3.1.0+dfsg/src/Makefile.am 2014-01-02 11:28:11.433565170 -0500 +@@ -18,7 +18,10 @@ + $(bs2b_HEADERS) + + libbs2b_la_LDFLAGS = \ +- -lm -version-info 0:0:0 ++ -version-info 0:0:0 ++ ++libbs2b_la_LIBADD = \ ++ -lm + + libbs2b_la_SOURCES = \ + bs2b.c \ +Index: libbs2b-3.1.0+dfsg/configure.ac +=================================================================== +--- libbs2b-3.1.0+dfsg.orig/configure.ac 2009-06-04 14:17:02.000000000 -0400 ++++ libbs2b-3.1.0+dfsg/configure.ac 2014-01-02 11:39:23.214145269 -0500 +@@ -5,7 +5,7 @@ + AC_INIT([libbs2b], [3.1.0], [[email protected]]) + AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([1.10.1 -Wall foreign subdir-objects +- dist-zip dist-bzip2 dist-lzma]) ++ dist-zip dist-bzip2]) + AC_CONFIG_SRCDIR([src/bs2b.h]) + + # Checks for programs. diff -Nru libbs2b-3.1.0+dfsg/debian/patches/series libbs2b-3.1.0+dfsg/debian/patches/series --- libbs2b-3.1.0+dfsg/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libbs2b-3.1.0+dfsg/debian/patches/series 2014-10-04 12:26:16.000000000 +0000 @@ -0,0 +1,2 @@ +fix-format-security-warning.diff +missing_math_lib.patch diff -Nru libbs2b-3.1.0+dfsg/debian/rules libbs2b-3.1.0+dfsg/debian/rules --- libbs2b-3.1.0+dfsg/debian/rules 2011-07-25 16:06:09.000000000 +0000 +++ libbs2b-3.1.0+dfsg/debian/rules 2014-10-04 12:11:47.000000000 +0000 @@ -3,7 +3,7 @@ LDFLAGS += -Wl,--as-needed %: - dh $@ + dh $@ --with autoreconf PROJECT="bs2b/libbs2b" @@ -19,3 +19,7 @@ mv $(PACKAGE)-$(VERSION) $(PACKAGE)_$(VERSION)+dfsg.orig tar zcf ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz $(PACKAGE)_$(VERSION)+dfsg.orig rm -r $(PACKAGE)_$(VERSION)+dfsg.orig $(PACKAGE)-$(VERSION).tar.gz + +override_dh_auto_clean: + dh_auto_clean + rm -f config.log
I have uploaded a libbs2b NMU to delayed/5 with the attatched debdiff.
Please tell me if you have any objections.
