Control: tags -1 + patch On Sat, Dec 01, 2018 at 06:50:28PM +0100, Andreas Henriksson wrote: > Package: ss-dev > Version: 2.0-1.44.4-2 > Severity: normal > User: [email protected] > Usertags: usrmerge [...]
Debdiff adding SED=/bin/sed in debian/rules attached for your convenince. Regards, Andreas Henriksson
diff -Nru e2fsprogs-1.44.4/debian/changelog e2fsprogs-1.44.4/debian/changelog --- e2fsprogs-1.44.4/debian/changelog 2018-08-23 01:30:17.000000000 +0200 +++ e2fsprogs-1.44.4/debian/changelog 2018-12-01 18:52:38.000000000 +0100 @@ -1,3 +1,12 @@ +e2fsprogs (1.44.4-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Explicitly specify SED=/bin/sed (similar to existing AWK) + - this makes build reproducible in merged-usr vs non-merged systems + (Closes: #915204) + + -- Andreas Henriksson <[email protected]> Sat, 01 Dec 2018 18:52:38 +0100 + e2fsprogs (1.44.4-2) unstable; urgency=medium * tune2fs fix dereference of freed memory after journal diff -Nru e2fsprogs-1.44.4/debian/rules e2fsprogs-1.44.4/debian/rules --- e2fsprogs-1.44.4/debian/rules 2018-08-23 01:30:17.000000000 +0200 +++ e2fsprogs-1.44.4/debian/rules 2018-12-01 18:52:09.000000000 +0100 @@ -206,7 +206,7 @@ mkdir -p ${stdbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) - cd ${stdbuilddir} && AWK=/usr/bin/awk \ + cd ${stdbuilddir} && AWK=/usr/bin/awk SED=/bin/sed \ ../../configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \ LDFLAGS="$(LDFLAGS)" CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \ @@ -215,6 +215,7 @@ LDFLAGS_STATIC="$(LDFLAGS_STATIC)" else cd ${stdbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ + SED=/bin/sed \ ../../configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \ @@ -237,7 +238,7 @@ mkdir -p ${bfbuilddir} ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) - cd ${bfbuilddir} && AWK=/usr/bin/awk \ + cd ${bfbuilddir} && AWK=/usr/bin/awk SED=/bin/sed \ ../../configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS} ${BF_CFLAGS}" \ CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \ @@ -247,6 +248,7 @@ LDFLAGS_STATIC="$(LDFLAGS_STATIC)" else cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \ + SED=/bin/sed \ ../../configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \ ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
