mirror of https://github.com/vitalif/e2fsprogs
Merge branch 'next' into debian-packaging
Theodore Ts'o
commit
4fa126b596
|
|
@ -1,3 +1,13 @@
|
|||
e2fsprogs (1.43-3) UNRELEASED; urgency=medium
|
||||
|
||||
* Fix various debian packaging nits
|
||||
* Fix spelling mistakes in the copyright files
|
||||
* Fix various spelling mistakes in man pages
|
||||
* Fix project quota bugs in e2fsck and mke2fs
|
||||
* Build binaries with hardening support
|
||||
|
||||
-- Theodore Y. Ts'o <tytso@mit.edu> Sun, 22 May 2016 20:51:29 -0400
|
||||
|
||||
e2fsprogs (1.43-2) unstable; urgency=medium
|
||||
|
||||
* Update watch file to check for the GPG signatures
|
||||
|
|
@ -16,6 +26,12 @@ e2fsprogs (1.43-1) unstable; urgency=medium
|
|||
|
||||
-- Theodore Y. Ts'o <tytso@mit.edu> Tue, 17 May 2016 01:04:28 -0400
|
||||
|
||||
e2fsprogs (1.43~WIP.2016.03.15-2) sid; urgency=low
|
||||
|
||||
* Fix FTBFS on big-endian systems
|
||||
|
||||
-- Theodore Y. Ts'o <tytso@mit.edu> Thu, 17 Mar 2016 22:55:52 -0400
|
||||
|
||||
e2fsprogs (1.43~WIP.2016.05.12-1) unstable; urgency=medium
|
||||
|
||||
* New upstream version
|
||||
|
|
@ -240,7 +256,7 @@ e2fsprogs (1.42.11-1) unstable; urgency=medium
|
|||
* Fixed cross-compilation support. (Closes: #753375)
|
||||
* Update/fix various man pages
|
||||
|
||||
-- Theodore Y. Ts'o <tytso@mit.edu> Wed, 9 July 2014 23:43:27 -0400
|
||||
-- Theodore Y. Ts'o <tytso@mit.edu> Wed, 9 Jul 2014 23:43:27 -0400
|
||||
|
||||
e2fsprogs (1.42.10-1.1) unstable; urgency=medium
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,15 @@ Build-Depends: gettext, texinfo, pkg-config, gcc-multilib [mips mipsel], libfuse
|
|||
Standards-Version: 3.9.8
|
||||
Homepage: http://e2fsprogs.sourceforge.net
|
||||
|
||||
Package: fuse2fs
|
||||
Priority: optional
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Architecture: any
|
||||
Description: ext2 / ext3 / ext4 file system driver for FUSE
|
||||
fuse2fs is a FUSE file system client that supports reading and
|
||||
writing from devices or image files containing ext2, ext3, and ext4
|
||||
file systems.
|
||||
|
||||
ifdef(`E2FSCK_STATIC',``
|
||||
Package: e2fsck-static
|
||||
Priority: optional
|
||||
|
|
@ -124,7 +133,7 @@ Description: runtime components for the Universally Unique ID library
|
|||
|
||||
ifdef(`UDEB_PKGS',``
|
||||
Package: libuuid1-udeb
|
||||
XC-Package-Type: udeb
|
||||
Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Priority: optional
|
||||
Depends: ${shlibs:Depends}
|
||||
|
|
@ -161,7 +170,7 @@ Description: block device id library
|
|||
|
||||
ifdef(`UDEB_PKGS',``
|
||||
Package: libblkid1-udeb
|
||||
XC-Package-Type: udeb
|
||||
Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Priority: optional
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
|
|
@ -193,7 +202,7 @@ Description: block device id library - headers and static libraries
|
|||
|
||||
ifdef(`UDEB_PKGS',``
|
||||
Package: e2fsprogs-udeb
|
||||
XC-Package-Type: udeb
|
||||
Package-Type: udeb
|
||||
Section: debian-installer
|
||||
Priority: optional
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
|
|
@ -250,6 +259,7 @@ Multi-Arch: foreign
|
|||
Suggests: gpart, parted, e2fsck-static
|
||||
Conflicts: dump (<< 0.4b4-4), quota (<< 1.55-8.1), initscripts (<< 2.85-4), sysvinit (<< 2.85-4)
|
||||
Replaces: hurd (<= 20040301-1), libblkid1 (<< 1.38+1.39-WIP-2005.12.10-2), libuuid1 (<< 1.38+1.39-WIP-2005.12.10-2)
|
||||
Recommends: fuse2fs
|
||||
Architecture: any
|
||||
Description: ext2/ext3/ext4 file system utilities
|
||||
The ext2, ext3 and ext4 file systems are successors of the original ext
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@ Upstream Author: Theodore Ts'o <tytso@mit.edu>
|
|||
Copyright notice:
|
||||
|
||||
This package, the EXT2 filesystem utilities, are made available under
|
||||
the GNU Public License version 2, with the exception of the lib/ext2fs
|
||||
and lib/e2p libraries, which are made available under the GNU Library
|
||||
General Public License Version 2, the lib/uuid library which is made
|
||||
available under a BSD-style license and the lib/et and lib/ss
|
||||
libraries which are made available under an MIT-style license.
|
||||
the GNU General Public License version 2, with the exception of the
|
||||
lib/ext2fs and lib/e2p libraries, which are made available under the
|
||||
GNU Library General Public License Version 2, the lib/uuid library
|
||||
which is made available under a BSD-style license and the lib/et and
|
||||
lib/ss libraries which are made available under an MIT-style license.
|
||||
|
||||
Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
||||
2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Theodore Ts'o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
/usr/sbin/fuse2fs
|
||||
/usr/share/man/man1/fuse2fs.1
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
This is the Debian GNU/Linux prepackaged version of the ss
|
||||
command-line interface parsing library library. It is currently
|
||||
command-line interface parsing library. It is currently
|
||||
distributed together with the EXT2 file system utilities, which are
|
||||
otherwise packaged as "e2fsprogs".
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
|
||||
-include debian/rules.custom
|
||||
|
||||
export DEB_BUILD_MAINT_OPTIONS ?= hardening=+all
|
||||
|
||||
# be paranoid
|
||||
export LC_ALL ?= C
|
||||
|
||||
|
|
@ -134,10 +136,13 @@ DEFAULT_CFLAGS ?= -g -O2
|
|||
DEFAULT_LDFLAGS ?= -Wl,-Bsymbolic-functions
|
||||
|
||||
CFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \
|
||||
DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) \
|
||||
dpkg-buildflags --get CFLAGS; else echo $(DEFAULT_CFLAGS) ; fi)
|
||||
LDFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \
|
||||
DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) \
|
||||
dpkg-buildflags --get LDFLAGS; else echo $(DEFAULT_LDFLAGS) ; fi)
|
||||
CPPFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \
|
||||
DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) \
|
||||
dpkg-buildflags --get CPPFLAGS; fi)
|
||||
|
||||
ifeq (${DEB_HOST_ARCH},alpha)
|
||||
|
|
@ -158,6 +163,11 @@ BUILD_STATIC = build-static
|
|||
E2FSCK_STATIC = ${staticbuilddir}/e2fsck/e2fsck.static
|
||||
endif
|
||||
|
||||
CFLAGS_SHLIB = $(filter-out -fPIE -fpie -pie,$(CFLAGS))
|
||||
CFLAGS_STLIB = $(filter-out -fPIE -fpie -pie,$(CFLAGS))
|
||||
LDFLAGS_SHLIB = $(filter-out -fPIE -fpie -pie,$(LDFLAGS))
|
||||
LDFLAGS_STATIC = $(filter-out -fPIE -fpie -pie,$(LDFLAGS))
|
||||
|
||||
ifneq ($(SKIP_UDEB),)
|
||||
SKIP_BF ?= yes
|
||||
endif
|
||||
|
|
@ -291,13 +301,20 @@ ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
|
|||
cd ${stdbuilddir} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)"
|
||||
LDFLAGS="$(LDFLAGS)" CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
else
|
||||
cd ${stdbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
|
||||
--host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
CPPFLAGS="$(CPPFLAGS)" CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS="$(LDFLAGS)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
endif
|
||||
|
||||
# specially-built MIPS libs
|
||||
|
|
@ -306,11 +323,19 @@ ifneq ($(ismips),)
|
|||
cd ${mipsbuilddir} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} \
|
||||
${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
||||
CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
cd ${mipsbuilddir64} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} \
|
||||
${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
||||
CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
endif
|
||||
|
||||
mkdir -p ${STAMPSDIR}
|
||||
|
|
@ -325,13 +350,21 @@ ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
|
|||
cd ${bfbuilddir} && AWK=/usr/bin/awk \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS} ${BF_CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
||||
CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
else
|
||||
cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
|
||||
--host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
||||
CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
endif
|
||||
mkdir -p ${STAMPSDIR}
|
||||
touch ${CFGBFSTAMP}
|
||||
|
|
@ -344,13 +377,21 @@ ${CFGSTATICSTAMP}:
|
|||
ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
|
||||
cd ${staticbuilddir} && AWK=/usr/bin/awk ${topdir}/configure \
|
||||
${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
||||
CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
else
|
||||
cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
|
||||
${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \
|
||||
${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
|
||||
--host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
|
||||
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
|
||||
CFLAGS_SHLIB="$(CFLAGS_SHLIB)" \
|
||||
CFLAGS_STLIB="$(CFLAGS_STLIB)" \
|
||||
LDFLAGS_SHLIB="$(LDFLAGS_SHLIB)" \
|
||||
LDFLAGS_STATIC="$(LDFLAGS_STATIC)"
|
||||
endif
|
||||
mkdir -p ${STAMPSDIR}
|
||||
touch ${CFGSTATICSTAMP}
|
||||
|
|
@ -407,7 +448,7 @@ ${BUILDSTATICSTAMP}: ${CFGSTATICSTAMP}
|
|||
dh_testdir
|
||||
$(MAKE) -C ${staticbuilddir} V=1 libs
|
||||
ifneq ($(BUILD_E2FSCK_STATIC),no)
|
||||
$(MAKE) -C ${staticbuilddir}/e2fsck V=1 all e2fsck.static
|
||||
$(MAKE) -C ${staticbuilddir}/e2fsck V=1 e2fsck.static
|
||||
endif
|
||||
touch ${BUILDSTATICSTAMP}
|
||||
|
||||
|
|
@ -576,18 +617,7 @@ endif
|
|||
dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
|
||||
dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
|
||||
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsprogs \
|
||||
-plibcomerr${COMERR_SOVERSION} \
|
||||
-plibss${SS_SOVERSION} \
|
||||
-pe2fslibs $(DBG_PACKAGES)
|
||||
ifneq ($(BUILD_E2FSCK_STATIC),no)
|
||||
DH_OPTIONS= dh_installchangelogs -pe2fsck-static
|
||||
endif
|
||||
ifneq ($(UTIL_LINUX_NG),yes)
|
||||
DH_OPTIONS= dh_installchangelogs -plibuuid${UUID_SOVERSION} \
|
||||
-puuid-dev -puuid-runtime -plibblkid${BLKID_SOVERSION}
|
||||
endif
|
||||
|
||||
dh_installchangelogs
|
||||
dh_fixperms
|
||||
dh_strip $(call dh_strip_args,e2fsprogs)
|
||||
ifneq ($(BUILD_E2FSCK_STATIC),no)
|
||||
|
|
@ -616,33 +646,6 @@ endif
|
|||
/bin/rm debian/$$i.tmp-patch; \
|
||||
done
|
||||
|
||||
for i in e2fsprogs e2fslibs \
|
||||
$(if $(filter $(USE_DBGSYM),yes),,e2fsprogs-dbg e2fslibs-dbg) ; \
|
||||
do \
|
||||
$(INSTALL) -p -m 0644 debian/copyright \
|
||||
${debdir}/$$i/usr/share/doc/$$i/copyright; \
|
||||
done
|
||||
|
||||
ifneq ($(USE_DBGSYM),yes)
|
||||
ifneq ($(UTIL_LINUX_NG),yes)
|
||||
$(INSTALL) -p -m 0644 debian/uuid-runtime.copyright \
|
||||
${uuidruntimedbgdir}/usr/share/doc/uuid-runtime-dbg/copyright
|
||||
endif
|
||||
|
||||
$(INSTALL) -p -m 0644 debian/libcomerr2.copyright \
|
||||
${libcomerrdbgdir}/usr/share/doc/libcomerr2-dbg/copyright
|
||||
|
||||
$(INSTALL) -p -m 0644 debian/libss2.copyright \
|
||||
${libssdbgdir}/usr/share/doc/libss2-dbg/copyright
|
||||
|
||||
ifneq ($(UTIL_LINUX_NG),yes)
|
||||
$(INSTALL) -p -m 0644 debian/libblkid.copyright \
|
||||
${libblkiddbgdir}/usr/share/doc/libblkid1-dbg/copyright
|
||||
|
||||
$(INSTALL) -p -m 0644 debian/libuuid1.copyright \
|
||||
${libuuiddbgdir}/usr/share/doc/libuuid1-dbg/copyright
|
||||
endif
|
||||
endif
|
||||
dh_compress
|
||||
|
||||
dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
|
||||
|
|
@ -665,6 +668,8 @@ ifeq ($(SKIP_UDEB),)
|
|||
dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \
|
||||
-u"-Ldebian/e2fsprogs-udeb.shlibs.local"
|
||||
endif
|
||||
dh_shlibdeps -pfuse2fs -l${stdbuilddir}/lib \
|
||||
-u"-Ldebian/e2fsprogs.shlibs.local"
|
||||
|
||||
dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
|
||||
-Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
|
||||
|
|
@ -710,11 +715,3 @@ debug_flags:
|
|||
@echo CFLAGS is $(CFLAGS)
|
||||
@echo LDFLAGS is $(LDFLAGS)
|
||||
@echo CPPFLAGS is $(CPPFLAGS)
|
||||
|
||||
debug:
|
||||
echo $(DH_VERSION)
|
||||
echo $(USE_DBGSYM)
|
||||
echo $(call dh_strip_args,e2fsprogs)
|
||||
echo $(call dh_strip_args2,e2fsck-static,e2fsprogs)
|
||||
echo $(DBG_PACKAGES)
|
||||
echo $(if $(filter $(USE_DBGSYM),yes),,e2fsprogs-dbg e2fslibs-dbg)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,2 @@
|
|||
e2fsprogs source: weak-library-dev-dependency ss-dev on libss2 (= ${mainBinary})
|
||||
e2fsprogs source: weak-library-dev-dependency comerr-dev on libcomerr2 (= ${mainBinary})
|
||||
e2fsprogs source: weak-library-dev-dependency uuid-dev on libuuid1 (= ${mainBinary})
|
||||
e2fsprogs source: source-is-missing misc/util.o
|
||||
|
|
|
|||
Loading…
Reference in New Issue