diff -Nru tgt-1.0.62/debian/changelog tgt-1.0.63/debian/changelog --- tgt-1.0.62/debian/changelog 2015-12-21 13:37:27.000000000 -0600 +++ tgt-1.0.63/debian/changelog 2016-03-09 17:01:05.000000000 -0600 @@ -1,3 +1,40 @@ +tgt (1:1.0.63-1ubuntu1) xenial; urgency=medium + + * Merge from Debian. Remaining changes: + - Drop glusterfs support, package not in main. + - debian/control + - debian/rules + - debian/tests/{admin, control, daemon, storage} + - debian/tgt-glusterfs.install (Deleted) + * Dropped changes + - debian/patches/tgtd_dont_fail_on_eacces.patch: included in new release + + -- Ryan Harper Wed, 09 Mar 2016 16:51:44 -0600 + +tgt (1:1.0.63-1) unstable; urgency=medium + + * New upstream release: + + Do not fail on EACCESS on oom_adjust; tgtd can now run in a different + user namespace (Closes: #813368). + * d/control: Use HTTPS URLs for Vcs-* fields. + * d/tests: Check for aio support (alongside rbd and glusterfs). + + -- Apollon Oikonomopoulos Sun, 07 Feb 2016 03:23:45 +0200 + +tgt (1:1.0.62-2) unstable; urgency=medium + + * Enable aio support, thanks to Harald Dunkel! (Closes: #811404) + + -- Apollon Oikonomopoulos Tue, 19 Jan 2016 11:22:35 +0200 + +tgt (1:1.0.62-1ubuntu2) xenial; urgency=medium + + * debian/patches/tgtd_dont_fail_on_eacces.patch + tgtd: fix root-under-userns errors when attempting oom_score_adj + (Closes: LP:#1518440) + + -- Ryan Harper Mon, 01 Feb 2016 02:18:57 -0600 + tgt (1:1.0.62-1ubuntu1) xenial; urgency=low * Merge from Debian unstable (LP: #1524982, LP: #1518440). Remaining diff -Nru tgt-1.0.62/debian/control tgt-1.0.63/debian/control --- tgt-1.0.62/debian/control 2015-12-10 22:14:18.000000000 -0600 +++ tgt-1.0.63/debian/control 2016-03-09 16:50:25.000000000 -0600 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Apollon Oikonomopoulos Build-Depends: debhelper (>= 9), libibverbs-dev, librdmacm-dev (>= 1.0.16), xsltproc, docbook-xsl, dh-systemd (>= 1.5), librbd-dev, - bash-completion, libsystemd-dev + bash-completion, libsystemd-dev, libaio-dev Vcs-Git: git://anonscm.debian.org/collab-maint/tgt.git Vcs-Browser: http://anonscm.debian.org/gitweb?p=collab-maint/tgt.git;a=summary Standards-Version: 3.9.6 diff -Nru tgt-1.0.62/debian/patches/fix-aio-detection.patch tgt-1.0.63/debian/patches/fix-aio-detection.patch --- tgt-1.0.62/debian/patches/fix-aio-detection.patch 1969-12-31 18:00:00.000000000 -0600 +++ tgt-1.0.63/debian/patches/fix-aio-detection.patch 2016-03-09 16:21:54.000000000 -0600 @@ -0,0 +1,16 @@ +Author: Apollon Oikonomopoulos +Description: Search for eventfd.h in /usr/include/ + +Last-Update: 2016-01-19 +Forwarded: no (Debian-specific) +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -25,7 +25,7 @@ + CFLAGS += -DUSE_SYSTEMD + endif + +-ifneq ($(shell test -e /usr/include/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) ++ifneq ($(shell test -e /usr/include/$(DEB_HOST_MULTIARCH)/sys/eventfd.h && test -e /usr/include/libaio.h && echo 1),) + CFLAGS += -DUSE_EVENTFD + TGTD_OBJS += bs_aio.o + LIBS += -laio diff -Nru tgt-1.0.62/debian/patches/series tgt-1.0.63/debian/patches/series --- tgt-1.0.62/debian/patches/series 2015-12-10 22:14:18.000000000 -0600 +++ tgt-1.0.63/debian/patches/series 2016-03-09 16:21:54.000000000 -0600 @@ -2,3 +2,4 @@ use-docbook-xsl.patch use-dpkg-buildflags.patch do-not-build-html-manpages.patch +fix-aio-detection.patch diff -Nru tgt-1.0.62/debian/tests/control tgt-1.0.63/debian/tests/control --- tgt-1.0.62/debian/tests/control 2015-12-21 13:30:36.000000000 -0600 +++ tgt-1.0.63/debian/tests/control 2016-03-09 16:23:01.000000000 -0600 @@ -1,6 +1,6 @@ Tests: daemon admin Depends: tgt -Tests: modules +Tests: storage Depends: tgt, tgt-rbd Restrictions: needs-root isolation-container allow-stderr diff -Nru tgt-1.0.62/debian/tests/modules tgt-1.0.63/debian/tests/modules --- tgt-1.0.62/debian/tests/modules 2015-12-21 13:38:17.000000000 -0600 +++ tgt-1.0.63/debian/tests/modules 1969-12-31 18:00:00.000000000 -0600 @@ -1,25 +0,0 @@ -#!/bin/sh - -# Restart tgtd to make sure modules are loaded -invoke-rc.d tgt restart || echo "Failed to restart tgt" >&2 - -# Test tgtd module usability -loaded_modules=$(tgtadm --mode sys --op show | \ - awk ' - BEGIN { p = 0 }; - /^[a-zA-Z]/ { p = 0 }; - /^Backing stores/ { p = 1; getline; }; - { if (p) { gsub("^ +", ""); print }; - }') -ret=0 - -for mod in rbd; do - if echo "$loaded_modules" | grep -q "\b$mod\b"; then - echo "OK - $mod module loaded" - else - echo "ERROR - $mod module not loaded" >&2 - ret=1 - fi -done - -exit $ret diff -Nru tgt-1.0.62/debian/tests/storage tgt-1.0.63/debian/tests/storage --- tgt-1.0.62/debian/tests/storage 1969-12-31 18:00:00.000000000 -0600 +++ tgt-1.0.63/debian/tests/storage 2016-03-09 16:23:18.000000000 -0600 @@ -0,0 +1,25 @@ +#!/bin/sh + +# Restart tgtd to make sure modules are loaded +invoke-rc.d tgt restart || echo "Failed to restart tgt" >&2 + +# Test tgtd module usability +supported_bs=$(tgtadm --mode sys --op show | \ + awk ' + BEGIN { p = 0 }; + /^[a-zA-Z]/ { p = 0 }; + /^Backing stores/ { p = 1; getline; }; + { if (p) { gsub("^ +", ""); print }; + }') +ret=0 + +for bs in rbd aio; do + if echo "$supported_bs" | grep -q "\b$bs\b"; then + echo "OK - $bs supported" + else + echo "ERROR - $bs not supported" >&2 + ret=1 + fi +done + +exit $ret diff -Nru tgt-1.0.62/doc/targets.conf.5.xml tgt-1.0.63/doc/targets.conf.5.xml --- tgt-1.0.62/doc/targets.conf.5.xml 2015-12-01 18:27:15.000000000 -0600 +++ tgt-1.0.63/doc/targets.conf.5.xml 2016-02-01 18:18:48.000000000 -0600 @@ -50,8 +50,7 @@ Defines a the start of a target definition. IQN is an ISCSI Qualified - Name such as "iqn.2001-04.com.example:storage1". See "ISCSI" on - Wikipedia for more information on IQNs. + Name such as "iqn.2001-04.com.example:storage1". Within this block should be target-level directives, as diff -Nru tgt-1.0.62/Makefile tgt-1.0.63/Makefile --- tgt-1.0.62/Makefile 2015-12-01 18:27:15.000000000 -0600 +++ tgt-1.0.63/Makefile 2016-02-01 18:18:48.000000000 -0600 @@ -1,4 +1,4 @@ -VERSION ?= 1.0.62 +VERSION ?= 1.0.63 CHECK_CC = cgcc CHECK_CC_FLAGS = '$(CHECK_CC) -Wbitwise -Wno-return-void -no-compile $(ARCH)' diff -Nru tgt-1.0.62/usr/tgtd.c tgt-1.0.63/usr/tgtd.c --- tgt-1.0.62/usr/tgtd.c 2015-12-01 18:27:15.000000000 -0600 +++ tgt-1.0.63/usr/tgtd.c 2016-02-01 18:18:48.000000000 -0600 @@ -604,7 +604,7 @@ } err = oom_adjust(); - if (err && getuid() == 0) + if (err && (errno != EACCES) && getuid() == 0) exit(1); err = nr_file_adjust();