Please unblock libcitadel
Hi,
please unblock libcitadel that was just uploaded. It fixes a missing zero
termination to a string. The other changes in the diff are merely cosmetical:
adding quilt to apply the patch and replace configure.in with upstream's
version, ours had a test listed twice.
Full debdiff attached.
Thanks.
Michael
--
Michael Meskes
Michael at Fam-Meskes dot De, Michael at Meskes dot (De|Com|Net|Org)
Michael at BorussiaFan dot De, Meskes at (Debian|Postgresql) dot Org
Jabber: michael.meskes at gmail dot com
VfL Borussia! Força Barça! Go SF 49ers! Use Debian GNU/Linux, PostgreSQL
reverted:
--- libcitadel-8.14/configure.in
+++ libcitadel-8.14.orig/configure.in
@@ -77,30 +77,6 @@
AC_CHECK_HEADER(sys/sendfile.h, [AC_DEFINE(LINUX_SENDFILE, [], [whether we have the linux sendfile api])])
dnl TODO: we might need to check for the actual syntax....
-AC_MSG_CHECKING([whether your system knows about splice()])
-AC_TRY_COMPILE([
-#define _GNU_SOURCE
-#include <unistd.h>
-#include <fcntl.h>
-],
-[
- ssize_t sent, pipesize;
- int fd, SplicePipe[2];
- pipesize = splice(fd, NULL,
- SplicePipe[1], NULL,
- 1,
- SPLICE_F_MORE | SPLICE_F_MOVE|SPLICE_F_NONBLOCK);
-],
- [
- ok_splice=yes
- AC_DEFINE(LINUX_SPLICE, [], [whether we have the linux splice api])
- AC_MSG_RESULT([yes])
- ],
- [
- ok_splice=no
- AC_MSG_RESULT([no])
- ]
-)
AC_MSG_CHECKING([whether your system knows about splice()])
AC_TRY_COMPILE([
diff -u libcitadel-8.14/debian/control libcitadel-8.14/debian/control
--- libcitadel-8.14/debian/control
+++ libcitadel-8.14/debian/control
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Citadel Team <pkg-citadel-devel@lists.alioth.debian.org>
Uploaders: Wilfried Goesgens <w.goesgens@outgesourced.org>, Michael Meskes <meskes@debian.org>, Alexander Wirt <formorer@debian.org>
-Build-Depends: debhelper (>= 5), zlib1g-dev
+Build-Depends: debhelper (>= 5), zlib1g-dev, quilt (>= 0.40)
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-citadel/libcitadel.git
Vcs-Browser: http://git.debian.org/?p=pkg-citadel/libcitadel.git
diff -u libcitadel-8.14/debian/changelog libcitadel-8.14/debian/changelog
--- libcitadel-8.14/debian/changelog
+++ libcitadel-8.14/debian/changelog
@@ -1,3 +1,13 @@
+libcitadel (8.14-2) unstable; urgency=low
+
+ [ Wilfried Goesgens ]
+ * Add upstream patch to null terminate string
+
+ [ Michael Meskes ]
+ * Updated configure.in from upstream
+
+ -- Wilfried Goesgens <dothebart@citadel.org> Tue, 27 Nov 2012 12:15:38 +0100
+
libcitadel (8.14-1) unstable; urgency=low
* Imported Upstream version 8.14
diff -u libcitadel-8.14/debian/rules libcitadel-8.14/debian/rules
--- libcitadel-8.14/debian/rules
+++ libcitadel-8.14/debian/rules
@@ -4,6 +4,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -21,7 +23,7 @@
LDFLAGS += -pg
endif
-configure: configure-stamp
+configure: patch configure-stamp
configure-stamp:
dh_testdir
@@ -41,7 +43,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp install*-stamp configure-stamp
only in patch2:
unchanged:
--- libcitadel-8.14.orig/debian/README.source
+++ libcitadel-8.14/debian/README.source
@@ -0,0 +1,7 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.
+
only in patch2:
unchanged:
--- libcitadel-8.14.orig/debian/patches/series
+++ libcitadel-8.14/debian/patches/series
@@ -0,0 +1 @@
+citadel.git-1c81990cf77f3bf041a335368b2b446728f8fe77.patch
only in patch2:
unchanged:
--- libcitadel-8.14.orig/debian/patches/citadel.git-1c81990cf77f3bf041a335368b2b446728f8fe77.patch
+++ libcitadel-8.14/debian/patches/citadel.git-1c81990cf77f3bf041a335368b2b446728f8fe77.patch
@@ -0,0 +1,28 @@
+From 1c81990cf77f3bf041a335368b2b446728f8fe77 Mon Sep 17 00:00:00 2001
+From: Art Cancro <ajc@uncensored.citadel.org>
+Date: Tue, 31 Jul 2012 17:36:53 -0400
+Subject: [PATCH] When using the Linux kernel UUID generator, null terminate
+
+---
+ libcitadel/lib/tools.c | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git libcitadel/lib/tools.c libcitadel/lib/tools.c
+index d738451..f520ee2 100644
+--- libcitadel/lib/tools.c
++++ libcitadel/lib/tools.c
+@@ -885,7 +885,10 @@ void generate_uuid(char *buf) {
+ int rv;
+ rv = fread(buf, 36, 1, fp);
+ fclose(fp);
+- if (rv == 1) return;
++ if (rv == 1) {
++ buf[36] = 0;
++ return;
++ }
+ }
+ }
+
+--
+1.7.2.5
+
Reply to: