Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/e2fsprogs/DESCR Normal file
View File

@@ -0,0 +1,2 @@
The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs,
dumpe2fs, fsck, and others.

31
sysutils/e2fsprogs/Makefile Normal file
View File

@@ -0,0 +1,31 @@
# $NetBSD: Makefile,v 1.20 2012/10/23 19:51:00 asau Exp $
DISTNAME= e2fsprogs-1.41.12
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://e2fsprogs.sourceforge.net/
COMMENT= Second extended file system (ext2fs) management programs
GNU_CONFIGURE= yes
USE_TOOLS+= makeinfo gmake
INFO_FILES= yes
.include "../../mk/bsd.prefs.mk"
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
# Only build fsck(8) on platforms that need it.
PLIST_VARS+= fsck
.if ${OPSYS} == "Linux"
PLIST.fsck= yes
.else
CONFIGURE_ARGS+= --disable-fsck
.endif
EGDIR= ${PREFIX}/share/examples/ext2fs
CONF_FILES+= ${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} root_sysconfdir=${EGDIR:Q}
.include "../../mk/bsd.pkg.mk"

77
sysutils/e2fsprogs/PLIST Normal file
View File

@@ -0,0 +1,77 @@
@comment $NetBSD: PLIST,v 1.6 2010/12/23 06:34:50 ryoon Exp $
bin/chattr
bin/lsattr
bin/uuidgen
info/libext2fs.info
lib/e2initrd_helper
man/man1/chattr.1
man/man1/lsattr.1
man/man1/uuidgen.1
man/man5/e2fsck.conf.5
man/man5/mke2fs.conf.5
man/man8/badblocks.8
man/man8/blkid.8
man/man8/debugfs.8
man/man8/dumpe2fs.8
man/man8/e2freefrag.8
man/man8/e2fsck.8
man/man8/e2image.8
man/man8/e2label.8
man/man8/e2undo.8
man/man8/filefrag.8
man/man8/findfs.8
${PLIST.fsck}man/man8/fsck.8
man/man8/fsck.ext2.8
man/man8/fsck.ext3.8
man/man8/fsck.ext4.8
man/man8/fsck.ext4dev.8
man/man8/logsave.8
man/man8/mke2fs.8
man/man8/mkfs.ext2.8
man/man8/mkfs.ext3.8
man/man8/mkfs.ext4.8
man/man8/mkfs.ext4dev.8
man/man8/mklost+found.8
man/man8/resize2fs.8
man/man8/tune2fs.8
man/man8/uuidd.8
sbin/badblocks
sbin/blkid
sbin/debugfs
sbin/dumpe2fs
sbin/e2freefrag
sbin/e2fsck
sbin/e2image
sbin/e2label
sbin/e2undo
sbin/filefrag
sbin/findfs
${PLIST.fsck}sbin/fsck
sbin/fsck.ext2
sbin/fsck.ext3
sbin/fsck.ext4
sbin/fsck.ext4dev
sbin/logsave
sbin/mke2fs
sbin/mkfs.ext2
sbin/mkfs.ext3
sbin/mkfs.ext4
sbin/mkfs.ext4dev
sbin/mklost+found
sbin/resize2fs
sbin/tune2fs
sbin/uuidd
share/examples/ext2fs/mke2fs.conf
share/locale/ca/LC_MESSAGES/e2fsprogs.mo
share/locale/cs/LC_MESSAGES/e2fsprogs.mo
share/locale/de/LC_MESSAGES/e2fsprogs.mo
share/locale/es/LC_MESSAGES/e2fsprogs.mo
share/locale/fr/LC_MESSAGES/e2fsprogs.mo
share/locale/id/LC_MESSAGES/e2fsprogs.mo
share/locale/it/LC_MESSAGES/e2fsprogs.mo
share/locale/nl/LC_MESSAGES/e2fsprogs.mo
share/locale/pl/LC_MESSAGES/e2fsprogs.mo
share/locale/sv/LC_MESSAGES/e2fsprogs.mo
share/locale/tr/LC_MESSAGES/e2fsprogs.mo
share/locale/vi/LC_MESSAGES/e2fsprogs.mo
share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo

21
sysutils/e2fsprogs/distinfo Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: distinfo,v 1.18 2012/11/19 03:02:14 joerg Exp $
SHA1 (e2fsprogs-1.41.12.tar.gz) = 62b002fe507b2ddafc24b89532e472fe4b55a14f
RMD160 (e2fsprogs-1.41.12.tar.gz) = aa7f9a2e350fcab85c72deaaee5fdc2a5e9fb6e7
Size (e2fsprogs-1.41.12.tar.gz) = 4496194 bytes
SHA1 (patch-ab) = f18d86265be543bab68813200fb49099ad8af909
SHA1 (patch-ac) = 8f47354ee719d4b933eccc8c8f0a0c7fb7b0feff
SHA1 (patch-af) = 8e1c2f5b90b78fdd4c5a4fcb573f23fc1db6e90f
SHA1 (patch-am) = 9c3be47010f6101e4f41343e108b967c88847c12
SHA1 (patch-an) = 62acb3f18f61ae6a729a8eebd308a1a1efe83e50
SHA1 (patch-ao) = 241b33700249d09f60f11f3167ef8cf771d1e588
SHA1 (patch-ap) = 4f9f8e47ecbea53acb1318e5ef0abe58cfbbb9ce
SHA1 (patch-ar) = 9103ed55e0f13451fbb2f34c4bee28f5e24c216a
SHA1 (patch-as) = 6066be5bf84753419407d2ee70cd8934b918c298
SHA1 (patch-at) = 53cbd25d89a9df733ba931490c1dcb77b20ddbe3
SHA1 (patch-av) = 92c9d34c82cba121744cfff5b23e4b92c9442545
SHA1 (patch-aw) = cb5e382077c07f0ced114fcbf195537cc7b0058c
SHA1 (patch-e2fsck_jfs__user.h) = d0b8058f00a4ac5445645017bf83aafc8af63c8a
SHA1 (patch-lib_ext2fs_bitops.h) = 3d3c8862e00622a0b715e7ef162d229910b43ec1
SHA1 (patch-lib_ext2fs_ext2fs.h) = 0bd9fbfcf33008d90cecb7821d04791b27f286f2
SHA1 (patch-lib_ext2fs_tdb.c) = 21f2109420b6e35f3a5c194f26ce14f6cb07f4ef

26
sysutils/e2fsprogs/patches/patch-ab Normal file
View File

@@ -0,0 +1,26 @@
$NetBSD: patch-ab,v 1.3 2008/09/21 16:16:06 joerg Exp $
--- lib/ext2fs/getsize.c.orig 2007-06-30 15:58:34 +0300
+++ lib/ext2fs/getsize.c
@@ -32,6 +32,9 @@
#ifdef HAVE_SYS_DISKLABEL_H
#include <sys/disklabel.h>
#endif
+#ifdef __DragonFly__
+#include <sys/disklabel32.h>
+#endif
#ifdef HAVE_SYS_DISK_H
#ifdef HAVE_SYS_QUEUE_H
#include <sys/queue.h> /* for LIST_HEAD */
@@ -154,7 +157,11 @@ errcode_t ext2fs_get_device_size(const c
#endif
#ifdef HAVE_SYS_DISKLABEL_H
int part;
+#ifdef __DragonFly__
+ struct disklabel32 lab;
+#else
struct disklabel lab;
+#endif
struct partition *pp;
char ch;
#endif /* HAVE_SYS_DISKLABEL_H */

40
sysutils/e2fsprogs/patches/patch-ac Normal file
View File

@@ -0,0 +1,40 @@
$NetBSD: patch-ac,v 1.3 2008/09/21 16:16:06 joerg Exp $
--- lib/blkid/getsize.c.orig 2008-06-30 00:05:45 +0300
+++ lib/blkid/getsize.c
@@ -32,6 +32,9 @@
#ifdef HAVE_SYS_DISKLABEL_H
#include <sys/disklabel.h>
#endif
+#ifdef __DragonFly__
+#include <sys/disklabel32.h>
+#endif
#ifdef HAVE_SYS_DISK_H
#ifdef HAVE_SYS_QUEUE_H
#include <sys/queue.h> /* for LIST_HEAD */
@@ -86,8 +89,13 @@ blkid_loff_t blkid_get_dev_size(int fd)
#endif
#ifdef HAVE_SYS_DISKLABEL_H
int part = -1;
+#ifdef __DragonFly__
+ struct disklabel32 lab;
+ struct partition32 *pp;
+#else
struct disklabel lab;
struct partition *pp;
+#endif
char ch;
struct stat st;
#endif /* HAVE_SYS_DISKLABEL_H */
@@ -144,7 +152,11 @@ blkid_loff_t blkid_get_dev_size(int fd)
*/
if ((fstat(fd, &st) >= 0) && (S_ISBLK(st.st_mode) || S_ISCHR(st.st_mode)))
part = st.st_rdev & 7;
+#ifdef __DragonFly__
+ if (part >= 0 && (ioctl(fd, DIOCGDINFO32, (char *)&lab) >= 0)) {
+#else
if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
+#endif
pp = &lab.d_partitions[part];
if (pp->p_size)
return pp->p_size << 9;

17
sysutils/e2fsprogs/patches/patch-af Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-af,v 1.7 2010/12/23 06:34:50 ryoon Exp $
--- lib/ext2fs/ismounted.c.orig 2010-05-18 03:04:39.000000000 +0000
+++ lib/ext2fs/ismounted.c
@@ -198,7 +198,11 @@ static errcode_t check_mntent(const char
static errcode_t check_getmntinfo(const char *file, int *mount_flags,
char *mtpt, int mtlen)
{
- struct statfs *mp;
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 299000900
+ struct statvfs *mp;
+#else
+ struct statfs *mp;
+#endif
int len, n;
const char *s1;
char *s2;

13
sysutils/e2fsprogs/patches/patch-am Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-am,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- e2fsck/e2fsck.conf.5.in.orig 2010-05-13 22:59:49.000000000 +0000
+++ e2fsck/e2fsck.conf.5.in
@@ -238,7 +238,7 @@ things out may be dangerous.)
}
.SH FILES
.TP
-.I /etc/e2fsck.conf
+.I @root_sysconfdir@/e2fsck.conf
The configuration file for
.BR e2fsck (8).
.SH SEE ALSO

15
sysutils/e2fsprogs/patches/patch-an Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: patch-an,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- e2fsck/e2fsck.h.orig 2010-05-13 22:59:49.000000000 +0000
+++ e2fsck/e2fsck.h
@@ -61,6 +61,10 @@
#define P_(singular, plural, n) ((n) == 1 ? (singular) : (plural))
#endif
+#ifndef ETC_DIR
+#define ETC_DIR "/etc" /* Where to find the config file */
+#endif
+
/*
* Exit codes used by fsck-type programs
*/

17
sysutils/e2fsprogs/patches/patch-ao Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-ao,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- lib/blkid/blkidP.h.orig 2009-08-13 01:39:57.000000000 +0000
+++ lib/blkid/blkidP.h
@@ -104,7 +104,11 @@ struct blkid_struct_cache
extern char *blkid_strdup(const char *s);
extern char *blkid_strndup(const char *s, const int length);
-#define BLKID_CACHE_FILE "/etc/blkid.tab"
+#ifndef ETC_DIR
+#define ETC_DIR "/etc" /* Where to find the config file */
+#endif
+
+#define BLKID_CACHE_FILE ETC_DIR "/blkid.tab"
#define BLKID_ERR_IO 5
#define BLKID_ERR_PROC 9

22
sysutils/e2fsprogs/patches/patch-ap Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-ap,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- lib/blkid/libblkid.3.in.orig 2009-08-13 01:39:57.000000000 +0000
+++ lib/blkid/libblkid.3.in
@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
specific block device names into configuration files.
.P
Block device information is normally kept in a cache file
-.I /etc/blkid.tab
+.I @root_sysconfdir@/blkid.tab
and is verified to still be valid before being returned to the user
(if the user has read permission on the raw block device, otherwise not).
The cache file also allows unprivileged users (normally anyone other
@@ -51,7 +51,7 @@ was written by Andreas Dilger for the ex
from Ted Ts'o. The library was subsequently heavily modified by Ted Ts'o.
.SH FILES
.TP
-.I /etc/blkid.tab
+.I @root_sysconfdir@/blkid.tab
Caches data extracted from each recognized block device.
.SH AVAILABILITY
.B libblkid

22
sysutils/e2fsprogs/patches/patch-ar Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-ar,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- misc/blkid.8.in.orig 2009-08-13 01:39:57.000000000 +0000
+++ misc/blkid.8.in
@@ -55,7 +55,7 @@ more devices.
Read from
.I cachefile
instead of reading from the default cache file
-.IR /etc/blkid.tab .
+.IR @root_sysconfdir@/blkid.tab .
If you want to start with a clean cache (i.e. don't report devices previously
scanned but not necessarily available at this time), specify
.IR /dev/null .
@@ -133,7 +133,7 @@ Display version number and exit.
Write the device cache to
.I writecachefile
instead of writing it to the default cache file
-.IR /etc/blkid.tab .
+.IR @root_sysconfdir@/blkid.tab .
If you don't want to save the cache to the default file, specify
.IR /dev/null.
If not specified it will be the same file as that given by the

13
sysutils/e2fsprogs/patches/patch-as Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-as,v 1.3 2010/12/23 06:34:50 ryoon Exp $
--- misc/blkid.c.orig 2009-08-13 01:39:57.000000000 +0000
+++ misc/blkid.c
@@ -52,7 +52,7 @@ static void usage(int error)
fprintf(out,
"usage:\t%s [-c <file>] [-ghlLv] [-o format] "
"[-s <tag>] [-t <token>]\n [-w <file>] [dev ...]\n"
- "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n"
+ "\t-c\tcache file (default: " ROOT_SYSCONFDIR "/blkid.tab, /dev/null = none)\n"
"\t-h\tprint this usage message and exit\n"
"\t-g\tgarbage collect the blkid cache\n"
"\t-s\tshow specified tag(s) (default show all tags)\n"

46
sysutils/e2fsprogs/patches/patch-at Normal file
View File

@@ -0,0 +1,46 @@
$NetBSD: patch-at,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- misc/mke2fs.8.in.orig 2010-02-06 03:51:19.000000000 +0000
+++ misc/mke2fs.8.in
@@ -159,7 +159,7 @@ option was specified.
.PP
The defaults of the parameters for the newly created filesystem, if not
overridden by the options listed below, are controlled by the
-.B /etc/mke2fs.conf
+.B @root_sysconfdir@/mke2fs.conf
configuration file. See the
.BR mke2fs.conf (5)
manual page for more details.
@@ -445,7 +445,7 @@ enabled by default are specified by the
relation, either in the
.I [defaults]
section in the
-.B /etc/mke2fs.conf
+.B @root_sysconfdir@/mke2fs.conf
configuration file,
or in the
.I [fs_types]
@@ -578,12 +578,12 @@ If this option is not specified,
will pick a default either via how
the command was run (for example, using a name of the form mkfs.ext2,
mkfs.ext3, etc.) or via a default as defined by the
-.BR /etc/mke2fs.conf (5)
+.BR @root_sysconfdir@/mke2fs.conf (5)
file. This option controls which filesystem options are used by
default, based on the
.B fstypes
configuration stanza in
-.BR /etc/mke2fs.conf (5).
+.BR @root_sysconfdir@/mke2fs.conf (5).
.sp
If the
.B \-O
@@ -602,7 +602,7 @@ Specify how the filesystem is going to b
.B mke2fs
can choose optimal filesystem parameters for that use. The usage
types that are supported are defined in the configuration file
-.BR /etc/mke2fs.conf (5).
+.BR @root_sysconfdir@/mke2fs.conf (5).
The user may specify one or more usage types
using a comma separated list.
.sp

13
sysutils/e2fsprogs/patches/patch-av Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-av,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- misc/mke2fs.conf.5.in.orig 2009-08-13 01:39:57.000000000 +0000
+++ misc/mke2fs.conf.5.in
@@ -354,7 +354,7 @@ by
on a per-filesystem type basis.
.SH FILES
.TP
-.I /etc/mke2fs.conf
+.I @root_sysconfdir@/mke2fs.conf
The configuration file for
.BR mke2fs (8).
.SH SEE ALSO

13
sysutils/e2fsprogs/patches/patch-aw Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-aw,v 1.2 2010/12/23 06:34:50 ryoon Exp $
--- doc/Makefile.in.orig 2010-02-10 23:16:03.000000000 +0000
+++ doc/Makefile.in
@@ -26,8 +26,6 @@ install-doc-libs: libext2fs.info libext2
echo " INSTALL_DATA $(infodir)/$$i" ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
done
- $(E) " GZIP $(infodir)/libext2fs.info*"
- -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
uninstall-doc-libs:
$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*

13
sysutils/e2fsprogs/patches/patch-e2fsck_jfs__user.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-e2fsck_jfs__user.h,v 1.1 2012/11/19 03:02:14 joerg Exp $
--- e2fsck/jfs_user.h.orig 2012-11-19 02:21:35.000000000 +0000
+++ e2fsck/jfs_user.h
@@ -83,7 +83,7 @@ extern size_t journal_tag_bytes(journal_
#define _INLINE_ extern
#else
#ifdef __GNUC__
-#define _INLINE_ extern __inline__
+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
#else /* For Watcom C */
#define _INLINE_ extern inline
#endif

13
sysutils/e2fsprogs/patches/patch-lib_ext2fs_bitops.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-lib_ext2fs_bitops.h,v 1.1 2012/11/19 03:02:14 joerg Exp $
--- lib/ext2fs/bitops.h.orig 2012-11-19 02:21:39.000000000 +0000
+++ lib/ext2fs/bitops.h
@@ -135,7 +135,7 @@ extern __u32 ext2fs_get_generic_bitmap_e
#define _INLINE_ extern
#else
#ifdef __GNUC__
-#define _INLINE_ extern __inline__
+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
#else /* For Watcom C */
#define _INLINE_ extern inline
#endif

13
sysutils/e2fsprogs/patches/patch-lib_ext2fs_ext2fs.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-lib_ext2fs_ext2fs.h,v 1.1 2012/11/19 03:02:14 joerg Exp $
--- lib/ext2fs/ext2fs.h.orig 2012-11-19 02:21:42.000000000 +0000
+++ lib/ext2fs/ext2fs.h
@@ -1180,7 +1180,7 @@ extern unsigned int ext2fs_div_ceil(unsi
#define _INLINE_ extern
#else
#ifdef __GNUC__
-#define _INLINE_ extern __inline__
+#define _INLINE_ extern __attribute__((__gnu_inline__)) __inline__
#else /* For Watcom C */
#define _INLINE_ extern inline
#endif

20
sysutils/e2fsprogs/patches/patch-lib_ext2fs_tdb.c Normal file
View File

@@ -0,0 +1,20 @@
$NetBSD: patch-lib_ext2fs_tdb.c,v 1.1 2012/06/27 08:52:05 bsiegert Exp $
--- lib/ext2fs/tdb.c.orig Tue Dec 13 04:47:53 2011
+++ lib/ext2fs/tdb.c
@@ -36,6 +36,7 @@ Last Changed Date: 2007-06-22 13:36:10 -
#define HAVE_UTIME_H
#define HAVE_UTIME
#endif
+#include <sys/types.h>
#define _XOPEN_SOURCE 600
#include <unistd.h>
@@ -49,7 +50,6 @@ Last Changed Date: 2007-06-22 13:36:10 -
#include <sys/select.h>
#endif
#include <sys/time.h>
-#include <sys/types.h>
#include <time.h>
#ifdef HAVE_UTIME_H
#include <utime.h>