Commit graph

65 commits

Author SHA1 Message Date
Matthias Andree
a25818bf29 Reconcile e2fsprogs ./. krb5-* conflicts.
* Move conflicting e2fsprogs headers & libs into .../e2fsprogs/... subdirs.
* Move conflicting awk scripts into ${DATADIR}.
* Rename and patch compile_et to e2fsprogs-compile_et.
* Remove conflict markers (from e2fsprogs and krb5-*).
* Add CPPFLAGS/LDFLAGS to sysutils/fusefs-ext2, including
  --rpath setting.

While here, also:
* sort pkg-plist and files/unwanted
* use FUSEFS_CONFIGURE_ENABLE=fuse2fs to prevent e2fsprogs from picking up
  fusefs (implies --disable-fuse2fs if the option remains disabled)
* add --without-included-gettext to CONFIGURE_ARGS just to be on the safe
  side.

And of course, bump PORTREVISION to 3 in e2fsprogs. Since other ports
do not change files or runtime behaviour, their PORTREVISION remains
untouched.
2017-10-30 16:55:26 +00:00
Matthias Andree
b5a8749dc8 Also add com_err headers, .pc file, and compile_et.
Reported by: ehaupt@
2017-10-29 23:59:46 +00:00
Matthias Andree
11a1e89fc7 Install header and .pc (pkg-config) files, too.
Reported by:	ehaupt@
2017-10-29 15:42:09 +00:00
Matthias Andree
578bf2e843 Update to new upstream release 1.43.6.
This fixes FreeBSD-related regressions observed in 1.43.4 and 1.43.5,
and portability issues around quota support on 32-bit builds.

Changelog: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.6>

[The MFH request will also need to take 1.43.5 upgrades into account,
so the easiest would probably to merge the entire history since branching.]

MFH:		2017Q3
2017-09-10 16:01:18 +00:00
Matthias Andree
ddc195e183 Fix "invalid argument" regression.
e2fsprogs v1.43.4 and .5 appear to attempt unaligned writes to disk
devices, which causes "invalid argument" errors and failures.

Patch unix_io.c to always obtain the alignment requirements on
FreeBSD, so that e2fsprogs uses its own write buffers and read-
modify-write cycles when writing only parts of a block.

Bump PORTREVISION, as crucial executables and libs change.

While here, bump self-test requirement to FreeBSD >= 12,
since the maintainer has tested these on 11.0/11.1 amd64/i386.

Reported by:	Artyon Mirgorodsky (in private)
2017-08-27 12:21:09 +00:00
Matthias Andree
8cb747b5f3 Fix quota warnings in non-LP64 mode (11.x i386).
PR:		221447
Reported by:	vvd@unislabs.com
2017-08-12 21:49:49 +00:00
Matthias Andree
7841256d5c Remove GNUism in grep basic regular expression in self-test.
Versus Kyle's submission, replace "egrep" by "grep -E" to avoid
reintroducing deprecated tools.

PR:		218614
Submitted by:	Kyle Evans <bsdports@kyle-evans.net>
2017-04-21 22:59:11 +00:00
Matthias Andree
b907987b54 Update e2fsprogs to new upstream release 1.43.4.
This is predominantly a bug-fix release, it however ceases installing
the *ext4dev files, which have been replaced by *ext4 for quite a while,
and adds two translations [fi, ms].

While here, reset PORTREVISION on two slave ports.

ChangeLog: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.4>

Note in particular this part of the ChangeLog:
«Replace a test file but which had a "non-commercial use-only" copyright
permission file with a newer version from the Cyrus imapd package which
now has a 4-clause BSD license, which was making some lawyers nervous,
even though the test file in question was only used in lib/et's
regression testing and was never included in any compiled binary.
(Addresses Debian Bug: #840733)»

PR:		216774
Reported by:	Thomas Zander (riggs@)
MFH:		2017Q1
2017-02-05 23:39:14 +00:00
Matthias Andree
25ddbb284b Fix bounced I/O on unaligned buffers (FreeBSD 11+)
The bounce-buffer I/O driver fix in patch-lib_ext2fs_unix__io.c is a
prototypical fix, and has been forwarded upstream, but it permits us to
pass all self-tests (mostly undo-related) that were still failing on
11.0-RC2 amd64.  There is some potential for optimization,
posix_memalign() might save us quite a few memcpy() calls and replace
the now-repaired code paths by a simple pread[64]() or pwrite[64]().

Remove BROKEN, but insist (by setting BROKEN conditionally) on anything
that is FreeBSD 11 or newer, or non-i386/non-amd64, that the user runs
at least the small self-tests.

Revise option descriptions a bit.

Bump PORTREVISION.
2016-09-12 23:05:22 +00:00
Matthias Andree
c0c8ea3531 Fix most of the FreeBSD 11+ issues, except e2undo.
Pull in upstream Git patch for lib/ext2fs/unix_io.c to fix unaligned
multi-block writes, and disable the two known failing e2undo patches
ONLY for the exact 1.43.3_2, even if "ALLTESTS" is enabled.
(Modify the post-patch:: target to avoid that.)

The port is still marked BROKEN on FreeBSD 11+ to protect the innocent,
but a TRYBROKEN=1 build that will not use e2undo should be fine now.

Obtained from:	Ted Y. Ts'o (upstream maintainer)
2016-09-11 10:26:24 +00:00
Matthias Andree
9249e847d5 Ignore SIGINFO during self-tests.
In the FreeBSD-specific patch, when the environment variable
e2fsprogs_inhibit_SIGINFO exists (whatever its content, even if empty),
do NOT install the SIGINFO handler.  Leverage this when running the
self-tests.  This is to avoid false negatives during the self-tests due
to interspersed SIGINFO output redirected from stderr to the log files.

Bump PORTREVISION because this changes the e2fsck utility.
2016-09-10 18:53:56 +00:00
Matthias Andree
fd78a097fb Update to new upstream release 1.43.3.
ChangeLog: (also see the log for 1.43.2 that the port skipped!)
<http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.3>

While here, refresh patches, and time-limit programs in self-test suite
to 60 s CPU time each, to avoid runaway processes from stalling the
self-tests for too long.

Still no joy on FreeBSD 11+ - the self-test results hint to massive data
loss, and more than 10 self-tests fail.
2016-09-10 18:00:53 +00:00
Matthias Andree
2872b1f99d Fix bogus test failure on FreeBSD 9.x. 2016-07-21 23:38:47 +00:00
Matthias Andree
a3ebddf90c Update to new upstream release 1.43.1.
1.43.1 has seen several FreeBSD portability fixes upstream, so we could
finally upgrade the port. Tweaking the test set for non-high-end
computers took a while.

Make set of self-tests configurable. Add Perl and GNU dd to build
dependency list when needed so tests can pass in a poudriere build.

Assorted other tweaks.

Upstream's change log:
  http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.1 and
  http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43
2016-07-15 12:16:01 +00:00
Matthias Andree
0c394defdf Update to upstream release 1.42.13.
Changelog: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.13>
2015-12-29 11:48:30 +00:00
Matthias Andree
4a84c93f31 Cherry-pick a security fix and a few other fixes from the upstream Git
repository.

Note that CVE-2015-0247 had already been fixed in 1.42.12 proper.

Security:	2a4bcd7d-bbb8-11e4-903c-080027ef73ec
Security:	CVE-2015-1572
2015-02-24 00:17:50 +00:00
Matthias Andree
e628120d67 Fix build on HEAD since r276737 removed DIOCGDINFO.
The code path that preferred DIOCGMEDIASIZE has been there for years
(since FreeBSD 6.1 at the latest), but there was no guard that checked
DIOCGINFO in one of the two getsize.c files.
2015-01-11 11:44:11 +00:00
Matthias Andree
884b6a175c Unbreak port:
- Refresh old patches to avoid fuzz.
- Add two upstream patches to fix the use-after-free() issue.
- There seem to be double-free() issues left but these do not show during
  self-test, only under valgrind instrumentation so we'll move the port
  ahead and get packages while working with upstream to debug this through
  the end.
- Bump PORTREVISION to 1.
2014-10-08 17:33:25 +00:00
Matthias Andree
b6a928e8a4 Update to new upstream release 1.42.12.
Changelog:	http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.12

Reset PORTREVISION on slaves.
Remove @dirrm* from master's + slaves' pkg-plist.
Remove patches overcome by upstream events.
Ignore PORTSCOUT - it can't figure out the directory structure.
No longer run self-test in parallel - exhausts redports directory.

Mark BROKEN on 11-CURRENT - causes miscompilation (bogus numbers in
output, SIGSEGV/SIGBUS):
  https://redports.org/~mandree/20141007190638-31576-251231/e2fsprogs-1.42.12.log
  https://redports.org/~mandree/20141007185700-4151-251228/e2fsprogs-1.42.12.log
2014-10-07 19:15:52 +00:00
Matthias Andree
ec88567c1f Update to new upstream release 1.42.10, with one post-release fix.
Changelog: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.10
2014-05-22 04:46:37 +00:00
Matthias Andree
8cd9199a7c - Update to new upstream release 1.42.9, release notes:
<http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.9>

- Add MAKE_ENV+=CHECK_CMD=@true to avoid build failures in intl/, which
  apparently does not include MCONFIG currently.

- Regenerate (and in two cases, modify) patches.
2014-01-07 00:00:23 +00:00
Matthias Andree
bc71f564c6 Kill three compiler warnings. 2013-06-27 23:29:03 +00:00
Matthias Andree
591e67d93a Update to new upstream release 1.42.8.
ChangeLog: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.8>

Switch to KERNEL_ORG site and enable USE_XZ for 25 % smaller download.
Switch to USE_CSTD=gnu99 (was gnu89).  Disable 2TB r_*_big_expand tests due
to their space requirements, reenable m_bigjournal, and also skip
f_extent_oobounds which breaks inside Tinderbox but is fine outside.
2013-06-27 22:41:11 +00:00
Matthias Andree
3cc998b1bb Fix build with clang.
(The issue has also been reported to the upstream maintainer.)

PR:		ports/176908
Submitted by:	Beeblebrox <zaphod@berentweb.com>
2013-03-13 08:11:32 +00:00
Matthias Andree
79446106b6 Update to new upstream release v1.42.5. 2012-08-02 18:17:11 +00:00
Matthias Andree
8033fc1550 Update to new upstream release 1.42.4.
ChangeLog: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.4
2012-06-13 19:24:53 +00:00
Matthias Andree
10cf8a82d8 Update to new upstream release 1.42.3.
ChangeLog: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.3

Convert to OptionsNG. (e2fsprogs-libss seems to compile fine, too)
2012-06-08 13:37:48 +00:00
Matthias Andree
283ea69593 Add a patch to MAKE_JOBS_SAFE.
The patch, and one removing bashisms in tests/*/script, have been submitted
to Ted Y. Ts'o, the upstream maintainer, for inclusion in the next release.

Reported by: pointyhat (by way of pav@)
2012-05-09 17:55:01 +00:00
Matthias Andree
4512e6eeb1 Fix build with clang.
Feature safe: yes
2012-04-01 15:39:56 +00:00
Matthias Andree
4263937401 Update to upstream bugfix/speedup release 1.42.2.
Release Notes: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html>
Feature safe:  yes
2012-04-01 15:29:03 +00:00
Matthias Andree
4baf4c1dda Fix missing return value in lib/quota/quotaio.c.
Fixes compilation with clang.

Submitted by: Zhihao Yuan
PR:           ports/165218
2012-02-17 21:31:06 +00:00
Matthias Andree
e3c1890ec3 Upgrade to new upstream release v1.42.
Changelog:
http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42
2012-02-16 00:50:14 +00:00
Matthias Andree
5f5c4ad5ff Drop patch that changed mke2fs default inode size to 128.
Not bumping PORTREVISION as there's no urge to push this and it doesn't "fix" anything.
2011-08-11 17:41:26 +00:00
Matthias Andree
c34284799a Update to upstream 1.41.11.
See the shipped RELEASE.NOTES for details.

Approved by: garga (mentor)
2010-03-18 11:42:42 +00:00
Matthias Andree
03b879ce63 Fix e2fsck -fD corruption without dirindex on ext2 or small directories
that have entries that sort before '.'.  From upstream's Git repo.

Approved by: miwi@ (mentor)
2010-03-14 10:46:48 +00:00
Martin Wilke
f6bff99e09 - Update to 1.41.9
PR:		139531
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2009-11-05 20:40:38 +00:00
Martin Wilke
194fc80cd2 - Update to 1.41.8
PR:		136795
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2009-07-16 21:41:38 +00:00
Martin Wilke
448a00f1dc * misc/e2fsprogs-libuuid:
- bump revision, as we're changing files and fixing a bug even for
  those who had successfully built libuuid before
- patch one more source file to make sure the clock.txt state file
  gets saved to the right directory
- try to run the newly-build uuidd for our self-test (ignoring
  failures, as they are non-fatal)
- (the actual build fix is inherited from the other port)

* sysutils/e2fsprogs:

- add files/patch-uuid-loop to actually fix the "self-test does not
  terminate" bug. What causes the client to see EOF prematurely or the
  server to fail to send a response remains unknown, but we'll fix the
  worse part of the issue: loop on EOF (read returning 0).

PR:		134156
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2009-05-16 22:36:57 +00:00
Martin Wilke
da44ccc17d - Update to 1.41.5
PR:		133963
Submitted by:	Matthias Andree <matthias.andree@gmx.de>
2009-04-25 22:25:12 +00:00
Martin Wilke
c5f28b7c10 - default inode size for mke2fs to 128
Inspired by: Wesley Shields
- remove BROKEN; Solaris 8 SPARC64 compiles package just fine

PR:		131556
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2009-02-10 22:36:42 +00:00
Martin Wilke
850e037efa - Update to 1.41.1
PR:		127414
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2008-09-23 08:18:45 +00:00
Martin Wilke
fc7290a3c0 - Update to 1.41.0
PR:		125561
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2008-07-18 16:06:20 +00:00
Martin Wilke
966b449dff - Update to 1.40.11
- Use assembly bitops, a new patch (provided by upstream maintainer Ted Ts'o to
  OpenBSD porter Frantisek Holop) fixes the related crashes.

PR:		124715
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2008-06-18 23:47:29 +00:00
Martin Wilke
fe346cb0da - Update to 1.40.9
- Update COMMENT/pkg-descr

PR:		123198
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2008-04-29 11:09:27 +00:00
Martin Wilke
b01f61f3c5 - Update to 1.40.6
- Add a regression check to avoid libintl/libiconv dependency
regressions as observed in 1.40.5 and _1
- Add a few comments
- Dump tests/*.failed files on failure, to aid debugging sparc64 problems
- Adjust patch line numbers
- Drop one misc/Makefile patch that was integrated upstream

PR:		120500
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2008-02-12 23:07:35 +00:00
Martin Wilke
70d9304ecb - Update to 1.40.4
PR:		119623
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2008-01-13 18:48:27 +00:00
Martin Wilke
cc70ac45e1 - Update to 1.40
PR:		114161
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2007-07-04 11:32:35 +00:00
Alexander Kabaev
ee96700447 Add patch to actually return 0 on function success. GCC 4.1 trips over
this bug, while gcc 3.4 lets it slide.
2007-04-11 03:48:04 +00:00
Yen-Ming Lee
adcead7ff1 2006-07-02 Matthias Andree <matthias.andree@gmx.de>
* fsck_ext2fs.8 (1.3): Reformat long lines.
	* fsck_ext2fs.8 (1.2): Add copyright notice and license.  Change -
	to \- where appropriate.  Add Id and FreeBSD keywords for ident.
	* fsck_ext2fs.c (1.6): Update license.
	* fsck_ext2fs.8 (1.1): Add a manual page.
	* fsck_ext2fs.c (1.5): When run with -F, do not report 'unknown
	option'.

PR:		99712
Submitted by:	Matthias Andree <matthias.andree at gmx.de>
2006-07-04 15:47:51 +00:00
Pav Lucistnik
a000f4798b - Update to 1.39
PR:		ports/98847
Submitted by:	Matthias Andree <matthias.andree@gmx.de> (maintainer)
2006-06-12 12:13:09 +00:00