[SCM] Debian packaging for bibutils branch, build, updated. upstream/4.1-87-ged43f0c

David Bremner bremner at unb.ca
Sat Oct 31 01:09:44 UTC 2009


The following commit has been merged in the build branch:
commit ed43f0caabdbcf087a4c029ab2a7a00db0453e31
Author: David Bremner <bremner at unb.ca>
Date:   Fri Oct 30 20:37:39 2009 -0300

    re-export patches: new patch fix/name_comma

diff --git a/debian/patches/debian/mkshlibs.diff b/debian/patches/debian/mkshlibs.diff
index 7af119d..7651cb4 100644
--- a/debian/patches/debian/mkshlibs.diff
+++ b/debian/patches/debian/mkshlibs.diff
@@ -14,7 +14,7 @@ Signed-off-by: David Bremner <bremner at unb.ca>
  4 files changed, 60 insertions(+), 46 deletions(-)
 
 diff --git a/Makefile_start b/Makefile_start
-index 2400829..0ef0446 100644
+index 9fc6c9b..4dc1114 100644
 --- a/Makefile_start
 +++ b/Makefile_start
 @@ -2,7 +2,7 @@ POSTFIX=REPLACE_POSTFIX
@@ -23,10 +23,10 @@ index 2400829..0ef0446 100644
  INSTALLDIR=REPLACE_INSTALLDIR
 -
 +SOVERSION ?= 0:0:0
- VERSION=4.3
- DATE=07/31/09
+ VERSION=4.5
+ DATE=10/24/09
  
-@@ -10,8 +10,8 @@ PROGRAMS=bib2xml ris2xml end2xml endx2xml med2xml isi2xml copac2xml \
+@@ -10,8 +10,8 @@ PROGRAMS=bib2xml ris2xml end2xml endx2xml med2xml isi2xml copac2xml ebi2xml \
  	xml2ads xml2bib xml2end xml2isi xml2ris xml2wordbib modsclean
  
  all : FORCE
@@ -207,4 +207,4 @@ index c0f005b..43604dd 100644
  
  all: $(PROGS)
 -- 
-tg: (754c8cc..) debian/mkshlibs (depends on: upstream)
+tg: (1782cdf..) debian/mkshlibs (depends on: upstream)
diff --git a/debian/patches/fix/name_comma.diff b/debian/patches/fix/name_comma.diff
new file mode 100644
index 0000000..4d6c3d4
--- /dev/null
+++ b/debian/patches/fix/name_comma.diff
@@ -0,0 +1,27 @@
+From: David Bremner <bremner at unb.ca>
+Subject: [PATCH] fix/name_comma
+
+If the first character of the input string is ',', then the existing
+code does not initialize end_last. This causes undefined behaviour,
+and in particular segmentation faults on i386 on some inputs.
+
+Signed-off-by: David Bremner <bremner at unb.ca>
+
+---
+ lib/name.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/name.c b/lib/name.c
+index 94a225c..1f51828 100644
+--- a/lib/name.c
++++ b/lib/name.c
+@@ -185,6 +185,7 @@ name_comma( char *p, newstr *outname )
+ 
+ 	/** Last name **/
+ 	start_last = skip_ws( p );
++	end_last = start_last;
+ 	while ( *p && ( *p!=',' ) ) {
+ 		newstr_addchar( outname, *p++ );
+ 		end_last = p;
+-- 
+tg: (1782cdf..) fix/name_comma (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index ed3c66d..098e111 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian/mkshlibs.diff -p1
+fix/name_comma.diff -p1

-- 
Debian packaging for bibutils



More information about the debian-science-commits mailing list