[Glibc-bsd-commits] r3908 - in trunk/istgt/debian: . patches

[Arno Töll]

Author: atoell-guest
Date: 2011-11-30 18:34:08 +0000 (Wed, 30 Nov 2011)
New Revision: 3908

Added:
   trunk/istgt/debian/patches/fix-autosize.patch
Modified:
   trunk/istgt/debian/changelog
   trunk/istgt/debian/control
   trunk/istgt/debian/patches/fix-as-needed-build.patch
   trunk/istgt/debian/patches/series
Log:
Add dpkg-dev (>= 1.16.1~) as build dependency, apply Michal's patch to work with symlinked devices

Modified: trunk/istgt/debian/changelog
===================================================================
--- trunk/istgt/debian/changelog	2011-11-27 17:19:55 UTC (rev 3907)
+++ trunk/istgt/debian/changelog	2011-11-30 18:34:08 UTC (rev 3908)
@@ -4,8 +4,14 @@
   * Fix "istgt: ftbs with ld --as-needed" - apply patch which shifts libraries
     in the compiler line after object files. Thanks Julian Taylor
     (Closes: #646272)
+  * Fix "cannot determine device size from symlink" Apply patch to use stat()
+    instead of lstat(). Thanks Michal Suchanek  (Closes: #650212)
+  * Fix "ftbfs on squeeze" Add missing build-dependency to dpkg-dev 1.16.1 which
+    is required to build the package because we're using dpkg-buildflags to
+    generate configure flags. That's guaranteed for Testing, but might be
+    helpful to know for backporters. (Closes: #650217)
 
- -- Arno Töll <debian at toell.net>  Thu, 27 Oct 2011 19:30:13 +0200
+ -- Arno Töll <debian at toell.net>  Wed, 30 Nov 2011 20:08:38 +0100
 
 istgt (0.4~20111008-1) unstable; urgency=low
 

Modified: trunk/istgt/debian/control
===================================================================
--- trunk/istgt/debian/control	2011-11-27 17:19:55 UTC (rev 3907)
+++ trunk/istgt/debian/control	2011-11-30 18:34:08 UTC (rev 3908)
@@ -4,7 +4,8 @@
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Arno Töll <debian at toell.net>, Robert Millan <rmh at debian.org>
 Dm-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.0), autotools-dev, libssl-dev, libcam-dev [kfreebsd-any]
+Build-Depends: debhelper (>= 8.0), autotools-dev, libssl-dev, libcam-dev [kfreebsd-any],
+	dpkg-dev (>= 1.16.1~)
 Standards-Version: 3.9.2
 Homepage: http://www.peach.ne.jp/archives/istgt/
 Vcs-Svn: svn://svn.debian.org/svn/glibc-bsd/trunk/istgt

Modified: trunk/istgt/debian/patches/fix-as-needed-build.patch
===================================================================
--- trunk/istgt/debian/patches/fix-as-needed-build.patch	2011-11-27 17:19:55 UTC (rev 3907)
+++ trunk/istgt/debian/patches/fix-as-needed-build.patch	2011-11-30 18:34:08 UTC (rev 3908)
@@ -2,6 +2,7 @@
  With the linker flag --as-needed libraries must be placed
  behind objects needing their symbols on the commandline.
 Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Forwarded: yes
 
 --- a/src/Makefile.in
 +++ b/src/Makefile.in

Added: trunk/istgt/debian/patches/fix-autosize.patch
===================================================================
--- trunk/istgt/debian/patches/fix-autosize.patch	                        (rev 0)
+++ trunk/istgt/debian/patches/fix-autosize.patch	2011-11-30 18:34:08 UTC (rev 3908)
@@ -0,0 +1,41 @@
+Description: support symlinks as device names
+ This patch adds support for symlinks as device store in the backend. 
+Author: Michal Suchanek <hramrach at centrum.cz>
+Forwarded: yes
+
+
+Index: istgt-0.4~20111008/src/istgt_lu.c
+===================================================================
+--- istgt-0.4~20111008.orig/src/istgt_lu.c	2011-11-27 21:48:45.000000000 +0100
++++ istgt-0.4~20111008/src/istgt_lu.c	2011-11-27 22:14:12.000000000 +0100
+@@ -606,7 +606,7 @@
+ 	int rc;
+ 
+ 	val = 0ULL;
+-	rc = lstat(file, &st);
++	rc = stat(file, &st);
+ 	if (rc != 0)
+ 		return val;
+ 	if (!S_ISCHR(st.st_mode) && !S_ISBLK(st.st_mode))
+@@ -689,11 +689,9 @@
+ 	int rc;
+ 
+ 	val = 0ULL;
+-	rc = lstat(file, &st);
++	rc = stat(file, &st);
+ 	if (rc < 0)
+ 		return val;
+-	if (S_ISLNK(st.st_mode))
+-		return val;
+ 
+ 	if (S_ISCHR(st.st_mode)) {
+ 		val = istgt_lu_get_devsize(file);
+@@ -702,7 +700,7 @@
+ 	} else if (S_ISREG(st.st_mode)) {
+ 		val = st.st_size;
+ 	} else {
+-		ISTGT_ERRLOG("lstat is neither REG, CHR nor BLK\n");
++		ISTGT_ERRLOG("stat is neither REG, CHR nor BLK\n");
+ 		val = 0ULL;
+ 	}
+ 	return val;

Modified: trunk/istgt/debian/patches/series
===================================================================
--- trunk/istgt/debian/patches/series	2011-11-27 17:19:55 UTC (rev 3907)
+++ trunk/istgt/debian/patches/series	2011-11-30 18:34:08 UTC (rev 3908)
@@ -1,3 +1,4 @@
 fix-installdir.patch
 add-istgtcontrol-manpage
 fix-as-needed-build.patch
+fix-autosize.patch