--- 5.6.0-1/debian/rules 2019-05-15 01:08:52.000000000 +0000
+++ 5.6.0-1ubuntu4/debian/rules 2020-06-25 21:59:35.000000000 +0000
@@ -23,8 +23,14 @@ pkgdev = DIST_ROOT=`pwd`/$(dirdev); expo
pkgdi = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT;
stdenv = @GZIP=-q; export GZIP;
+ifeq ($(target),amd64)
+export DEB_CFLAGS_MAINT_APPEND=-fcf-protection
+export DEB_LDFLAGS_MAINT_APPEND=-fcf-protection
+endif
+include /usr/share/dpkg/default.mk
+
options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
- INSTALL_USER=root INSTALL_GROUP=root \
+ INSTALL_USER=root INSTALL_GROUP=root LDFLAGS='$(LDFLAGS)' \
LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes --enable-blkid=yes --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
diopts = $(options) \
export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no --disable-ubsan --disable-addrsan --disable-threadsan --enable-lto" ;
@@ -33,20 +39,25 @@ checkdir = test -f debian/rules
build: build-arch build-indep
build-arch: built
build-indep: built
-built: dibuild config
+built: reconf dibuild config
@echo "== dpkg-buildpackage: build" 1>&2
$(MAKE) $(PMAKEFLAGS) default
touch built
-config: .census
+reconf: .reconf
+.reconf:
+ $(checkdir)
+ AUTOHEADER=/bin/true dh_autoreconf
+ touch $@
+
+config: .census .reconf
.census:
@echo "== dpkg-buildpackage: configure" 1>&2
$(checkdir)
- AUTOHEADER=/bin/true dh_autoreconf
$(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h
touch .census
-dibuild:
+dibuild: .reconf
$(checkdir)
@echo "== dpkg-buildpackage: installer" 1>&2
if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \
@@ -65,7 +76,7 @@ dibuild:
clean:
@echo "== dpkg-buildpackage: clean" 1>&2
$(checkdir)
- -rm -f built .census mkfs/mkfs.xfs-$(bootpkg)
+ -rm -f built .census .reconf mkfs/mkfs.xfs-$(bootpkg)
$(MAKE) distclean
-rm -rf $(dirme) $(dirdev) $(dirdi)
-rm -f debian/*substvars debian/files* debian/*.debhelper
@@ -81,7 +92,6 @@ binary-arch: checkroot built
$(pkgme) $(MAKE) -C . install
$(pkgdev) $(MAKE) -C . install-dev
$(pkgdi) $(MAKE) -C debian install-d-i
- $(pkgme) $(MAKE) dist
install -D -m 0755 debian/local/initramfs.hook debian/xfsprogs/usr/share/initramfs-tools/hooks/xfs
rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
rm -f debian/xfslibs-dev/lib/libhandle.la
--- 5.6.0-1/debian/control 2019-05-15 01:08:52.000000000 +0000
+++ 5.6.0-1ubuntu4/debian/control 2020-04-24 03:12:43.000000000 +0000
@@ -1,7 +1,8 @@
Source: xfsprogs
Section: admin
Priority: optional
-Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
Build-Depends: uuid-dev, dh-autoreconf, debhelper (>= 5), gettext, libtool, libreadline-gplv2-dev, libblkid-dev (>= 2.17), linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python, pkg-config
Standards-Version: 4.0.0