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

Sun Sep 9 12:15:45 UTC 2012

Author: atoell-guest
Date: 2012-09-09 12:15:44 +0000 (Sun, 09 Sep 2012)
New Revision: 4355

Removed:
   trunk/istgt/debian/patches/fix-as-needed-build.patch
   trunk/istgt/debian/patches/fix-autosize.patch
Modified:
   trunk/istgt/debian/changelog
   trunk/istgt/debian/patches/add-istgtcontrol-manpage
   trunk/istgt/debian/patches/fix-installdir.patch
   trunk/istgt/debian/patches/series
   trunk/istgt/debian/rules
Log:
Import new upstream version, refresh patches. Note: add-reload.patch needs more work. Also, a similar feature is upstream now

Modified: trunk/istgt/debian/changelog
===================================================================

--- trunk/istgt/debian/changelog	2012-08-17 11:08:14 UTC (rev 4354)
+++ trunk/istgt/debian/changelog	2012-09-09 12:15:44 UTC (rev 4355)
@@ -1,8 +1,14 @@
-istgt (0.4~20111008-4) UNRELEASED; urgency=low
+istgt (0.4~20120901-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream version
+  * Refresh patches by letting hunks beyond there offsets unchanged, with
+    these exceptions:
+    + Drop fix-as-needed-build.patch: applied upstream
+    + Drop fix-autosize.patch: applied upstream conditionally when compiling
+      with --enable-symlink-device which we do now.
 
- -- Arno Töll <arno at debian.org>  Wed, 27 Jun 2012 00:29:00 +0200
+ -- Arno Töll <arno at debian.org>  Sun, 09 Sep 2012 14:09:21 +0200
 
 istgt (0.4~20111008-3) unstable; urgency=low
 

Modified: trunk/istgt/debian/patches/add-istgtcontrol-manpage
===================================================================
--- trunk/istgt/debian/patches/add-istgtcontrol-manpage	2012-08-17 11:08:14 UTC (rev 4354)
+++ trunk/istgt/debian/patches/add-istgtcontrol-manpage	2012-09-09 12:15:44 UTC (rev 4355)
@@ -10,7 +10,7 @@
 
 --- a/doc/Makefile.in
 +++ b/doc/Makefile.in
-@@ -19,22 +19,24 @@
+@@ -22,23 +22,25 @@
  
  source   = 
  header   = 
@@ -27,6 +27,7 @@
  
  #########################################################################
  
+ .PHONY: all install install-doc install-dirs install-doc-dirs
 -all: istgt.1
 +all: $(MANPAGES)
  
@@ -38,27 +39,28 @@
 +		-e 's:%%MEDIADIR%%:$(mediadir):g' < $(patsubst %.1, %.1.in, $@) > $@
  
  dist: $(DISTFILES)
- 	mkdir $(DISTDIR)/$(subdir)
-@@ -44,9 +46,13 @@
+ 	$(MKDIR_P) $(DISTDIR)/$(subdir)
+@@ -48,9 +50,14 @@
  	done
  
  install: install-dirs
--	install -c -m 0644 istgt.1 $(DESTDIR)$(mandir)/man1/
+-	$(INSTALL) -m 0644 istgt.1 $(DESTDIR)$(mandir)/man1/
 -	-rm -f $(DESTDIR)$(mandir)/man1/istgt.1.gz
 -	gzip -9 $(DESTDIR)$(mandir)/man1/istgt.1
-+	set -e
++	set -e ; \
 +	for file in $(MANPAGES) ; \
-+	do \
++		do \
 +		install -c -m 0644 $$file $(DESTDIR)$(mandir)/man1/ ; \
 +		rm -f $(DESTDIR)$(mandir)/man1/$$file.gz ; \
 +		gzip -9 $(DESTDIR)$(mandir)/man1/$$file ; \
 +	done
++
  
  install-doc: install-doc-dirs
- 	install -c -m 0644 $(top_srcdir)/README $(DESTDIR)$(datadir)/doc/istgt/
-@@ -61,7 +67,7 @@
- 	mkdir -p $(DESTDIR)$(datadir)/doc/istgt
+ 	$(INSTALL) -m 0644 $(top_srcdir)/README $(DESTDIR)$(datadir)/doc/istgt/
+@@ -66,7 +73,7 @@
  
+ .PHONY: clean distclean depend
  clean:
 -	-rm -f istgt.1
 +	-rm -f $(MANPAGES)

Deleted: trunk/istgt/debian/patches/fix-as-needed-build.patch
===================================================================
--- trunk/istgt/debian/patches/fix-as-needed-build.patch	2012-08-17 11:08:14 UTC (rev 4354)
+++ trunk/istgt/debian/patches/fix-as-needed-build.patch	2012-09-09 12:15:44 UTC (rev 4355)
@@ -1,21 +0,0 @@
-Description: fix build with ld --as-needed
- 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
-@@ -77,10 +77,10 @@
- all: stamp-depend config.h istgt istgtcontrol
- 
- istgt: $(ISTGT)
--	$(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGT)
-+	$(CC) $(LDFLAGS) -o $@ $(ISTGT) $(LIBS)
- 
- istgtcontrol: $(ISTGTCONTROL)
--	$(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGTCONTROL)
-+	$(CC) $(LDFLAGS) -o $@ $(ISTGTCONTROL) $(LIBS) 
- 
- install: install-dirs
- 	install -c -m 0755 istgt $(DESTDIR)$(sbindir)

Deleted: trunk/istgt/debian/patches/fix-autosize.patch
===================================================================
--- trunk/istgt/debian/patches/fix-autosize.patch	2012-08-17 11:08:14 UTC (rev 4354)
+++ trunk/istgt/debian/patches/fix-autosize.patch	2012-09-09 12:15:44 UTC (rev 4355)
@@ -1,49 +0,0 @@
-Description: support symlinks as device names
- This patch adds support for symlinks as device store in the backend.
- .
- This patch was rejected upstream. Upstream was worried about security
- implications when following symlinks to logical devices. This is an opinion I
- do not share, as I consider existing file permission layers as sufficient.
- .
- Neither do several people asked for advise.
- .
- -- Arno Töll <arno at debian.net>
-
-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/fix-installdir.patch
===================================================================
--- trunk/istgt/debian/patches/fix-installdir.patch	2012-08-17 11:08:14 UTC (rev 4354)
+++ trunk/istgt/debian/patches/fix-installdir.patch	2012-09-09 12:15:44 UTC (rev 4355)
@@ -8,18 +8,18 @@
 
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -83,11 +83,11 @@
- 	$(CC) $(LDFLAGS) $(LIBS) -o $@ $(ISTGTCONTROL)
+@@ -88,11 +88,11 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(ISTGTCONTROL) $(LIBS)
  
  install: install-dirs
--	install -c -m 0755 istgt $(DESTDIR)$(bindir)
--	install -c -m 0755 istgtcontrol $(DESTDIR)$(bindir)
-+	install -c -m 0755 istgt $(DESTDIR)$(sbindir)
-+	install -c -m 0755 istgtcontrol $(DESTDIR)$(sbindir)
+-	$(INSTALL) -m 0755 istgt $(DESTDIR)$(bindir)
+-	$(INSTALL) -m 0755 istgtcontrol $(DESTDIR)$(bindir)
++	$(INSTALL) -m 0755 istgt $(DESTDIR)$(sbindir)
++	$(INSTALL) -m 0755 istgtcontrol $(DESTDIR)$(sbindir)
  
  install-dirs:
--	mkdir -p $(DESTDIR)$(bindir)
-+	mkdir -p $(DESTDIR)$(sbindir)
+-	$(MKDIR_P) $(DESTDIR)$(bindir)
++	$(MKDIR_P) $(DESTDIR)$(sbindir)
  
+ .PHONY: dist clean distclean depend
  dist: $(DISTFILES)
- 	mkdir $(DISTDIR)/$(subdir)

Modified: trunk/istgt/debian/patches/series
===================================================================
--- trunk/istgt/debian/patches/series	2012-08-17 11:08:14 UTC (rev 4354)
+++ trunk/istgt/debian/patches/series	2012-09-09 12:15:44 UTC (rev 4355)
@@ -1,5 +1,3 @@
 fix-installdir.patch
 add-istgtcontrol-manpage
-fix-as-needed-build.patch
-fix-autosize.patch
 add-reload.patch

Modified: trunk/istgt/debian/rules
===================================================================
--- trunk/istgt/debian/rules	2012-08-17 11:08:14 UTC (rev 4354)
+++ trunk/istgt/debian/rules	2012-09-09 12:15:44 UTC (rev 4355)
@@ -11,6 +11,7 @@
 	dh_auto_configure -- --with-configdir=/etc/istgt \
 		--with-logfacility=daemon \
 		--localstatedir=/var/run/istgt \
+		--enable-symlink-device \
 		$(shell dpkg-buildflags --export=configure)
 
 


