[Glibc-bsd-commits] r3329 - in trunk: freebsd-buildutils/debian freebsd-buildutils/debian/patches freebsd-buildutils/debian/source freebsd-libs/debian freebsd-libs/debian/patches freebsd-libs/debian/source freebsd-utils/debian freebsd-utils/debian/patches freebsd-utils/debian/source kfreebsd-7/debian kfreebsd-7/debian/patches kfreebsd-7/debian/source kfreebsd-8/debian kfreebsd-8/debian/patches kfreebsd-8/debian/source ufsutils/debian ufsutils/debian/patches ufsutils/debian/source
Guillem Jover
guillem at alioth.debian.org
Thu May 26 02:53:13 UTC 2011
Author: guillem
Date: 2011-05-26 02:53:11 +0000 (Thu, 26 May 2011)
New Revision: 3329
Added:
trunk/freebsd-buildutils/debian/source/
trunk/freebsd-buildutils/debian/source/format
trunk/freebsd-libs/debian/source/
trunk/freebsd-libs/debian/source/format
trunk/freebsd-utils/debian/source/
trunk/freebsd-utils/debian/source/format
trunk/kfreebsd-7/debian/source/
trunk/kfreebsd-7/debian/source/format
trunk/kfreebsd-8/debian/source/
trunk/kfreebsd-8/debian/source/format
trunk/ufsutils/debian/source/
trunk/ufsutils/debian/source/format
Removed:
trunk/freebsd-buildutils/debian/README.source
trunk/freebsd-libs/debian/README.source
trunk/freebsd-utils/debian/README.source
trunk/kfreebsd-7/debian/README.source
trunk/kfreebsd-8/debian/README.source
trunk/ufsutils/debian/README.source
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/control
trunk/freebsd-buildutils/debian/patches/00_upstream.diff
trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
trunk/freebsd-buildutils/debian/patches/03_glibc.diff
trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff
trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
trunk/freebsd-buildutils/debian/patches/07_brandelf.diff
trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
trunk/freebsd-buildutils/debian/patches/11_optreset.diff
trunk/freebsd-buildutils/debian/patches/14_config.diff
trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
trunk/freebsd-buildutils/debian/rules
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/01_sys_cam.diff
trunk/freebsd-libs/debian/patches/02_libcam.diff
trunk/freebsd-libs/debian/patches/05_libipx.diff
trunk/freebsd-libs/debian/patches/08_libdevstat.diff
trunk/freebsd-libs/debian/rules
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/patches/001_dmesg.diff
trunk/freebsd-utils/debian/patches/002_ifconfig.diff
trunk/freebsd-utils/debian/patches/003_kbdcontrol.diff
trunk/freebsd-utils/debian/patches/004_kldconfig.diff
trunk/freebsd-utils/debian/patches/005_ktrace.diff
trunk/freebsd-utils/debian/patches/006_mdconfig.diff
trunk/freebsd-utils/debian/patches/007_mount.diff
trunk/freebsd-utils/debian/patches/008_mount_hpfs.diff
trunk/freebsd-utils/debian/patches/009_mount_msdosfs.diff
trunk/freebsd-utils/debian/patches/010_mount_ntfs.diff
trunk/freebsd-utils/debian/patches/011_mount_nullfs.diff
trunk/freebsd-utils/debian/patches/012_mount_std.diff
trunk/freebsd-utils/debian/patches/013_pf.diff
trunk/freebsd-utils/debian/patches/014_route.diff
trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff
trunk/freebsd-utils/debian/patches/016_swapon.diff
trunk/freebsd-utils/debian/patches/017_sysctl.diff
trunk/freebsd-utils/debian/patches/018_umount.diff
trunk/freebsd-utils/debian/patches/020_lib.diff
trunk/freebsd-utils/debian/patches/021_netstat.diff
trunk/freebsd-utils/debian/patches/022_devd.diff
trunk/freebsd-utils/debian/patches/023_acpiconf.diff
trunk/freebsd-utils/debian/patches/024_devfs.diff
trunk/freebsd-utils/debian/patches/025_camcontrol.diff
trunk/freebsd-utils/debian/patches/026_kdump.diff
trunk/freebsd-utils/debian/patches/027_pppctl.diff
trunk/freebsd-utils/debian/patches/028_vidcontrol.diff
trunk/freebsd-utils/debian/patches/029_arp.diff
trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff
trunk/freebsd-utils/debian/patches/031_savecore.diff
trunk/freebsd-utils/debian/rules
trunk/kfreebsd-7/debian/changelog
trunk/kfreebsd-7/debian/control.in
trunk/kfreebsd-7/debian/patches/000_mbuf.diff
trunk/kfreebsd-7/debian/patches/000_nfsclient.diff
trunk/kfreebsd-7/debian/patches/001_misc.diff
trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-7/debian/patches/004_xargs.diff
trunk/kfreebsd-7/debian/patches/005_binutils.diff
trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
trunk/kfreebsd-7/debian/patches/008_config.diff
trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
trunk/kfreebsd-7/debian/patches/020_linker.diff
trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff
trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff
trunk/kfreebsd-7/debian/patches/104_linprocfs.diff
trunk/kfreebsd-7/debian/patches/902_version.diff
trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-7/debian/patches/904_dev_full.diff
trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-7/debian/patches/911_no_werror.diff
trunk/kfreebsd-7/debian/patches/912_binutils.diff
trunk/kfreebsd-7/debian/patches/913_uudecode.diff
trunk/kfreebsd-7/debian/patches/914_psm.diff
trunk/kfreebsd-7/debian/patches/915_ip6.v6only.diff
trunk/kfreebsd-7/debian/patches/916_ip6.accept_rtadv.diff
trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-7/debian/patches/999_config.diff
trunk/kfreebsd-7/debian/rules
trunk/kfreebsd-8/debian/changelog
trunk/kfreebsd-8/debian/control.in
trunk/kfreebsd-8/debian/patches/000_coda.diff
trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff
trunk/kfreebsd-8/debian/patches/001_misc.diff
trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
trunk/kfreebsd-8/debian/patches/004_xargs.diff
trunk/kfreebsd-8/debian/patches/007_clone_signals.diff
trunk/kfreebsd-8/debian/patches/008_config.diff
trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff
trunk/kfreebsd-8/debian/patches/013_ip_packed.diff
trunk/kfreebsd-8/debian/patches/020_linker.diff
trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff
trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff
trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
trunk/kfreebsd-8/debian/patches/106_teken_op.diff
trunk/kfreebsd-8/debian/patches/107_mount_update.diff
trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff
trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff
trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff
trunk/kfreebsd-8/debian/patches/200_xen.diff
trunk/kfreebsd-8/debian/patches/902_version.diff
trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
trunk/kfreebsd-8/debian/patches/904_dev_full.diff
trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff
trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff
trunk/kfreebsd-8/debian/patches/912_binutils.diff
trunk/kfreebsd-8/debian/patches/913_uudecode.diff
trunk/kfreebsd-8/debian/patches/914_psm.diff
trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
trunk/kfreebsd-8/debian/patches/916_NKPT_amd64.diff
trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
trunk/kfreebsd-8/debian/patches/999_config.diff
trunk/kfreebsd-8/debian/patches/999_firmware.diff
trunk/kfreebsd-8/debian/rules
trunk/ufsutils/debian/changelog
trunk/ufsutils/debian/control
trunk/ufsutils/debian/patches/00_include.patch
trunk/ufsutils/debian/patches/00_libport.patch
trunk/ufsutils/debian/patches/00_mount.patch
trunk/ufsutils/debian/patches/00_param.patch
trunk/ufsutils/debian/patches/01_libdisklabel.patch
trunk/ufsutils/debian/patches/01_libufs.patch
trunk/ufsutils/debian/patches/02_badsect.ufs.patch
trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch
trunk/ufsutils/debian/patches/02_dump.ufs.patch
trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
trunk/ufsutils/debian/patches/02_ffsinfo.patch
trunk/ufsutils/debian/patches/02_fsck.ufs.patch
trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
trunk/ufsutils/debian/patches/02_growfs.ufs.patch
trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
trunk/ufsutils/debian/patches/03_ufsmount.patch
trunk/ufsutils/debian/patches/99_makefiles.patch
trunk/ufsutils/debian/rules
Log:
Switch to source format ?\226?\128?\1563.0 (quilt)?\226?\128?\157
Remove quilt from Build-Depends.
Remove patch target in debian/rules.
Remove now unneeded README.source.
Refresh all patches.
Deleted: trunk/freebsd-buildutils/debian/README.source
===================================================================
--- trunk/freebsd-buildutils/debian/README.source 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/README.source 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- break
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/changelog 2011-05-26 02:53:11 UTC (rev 3329)
@@ -6,6 +6,11 @@
[ Guillem Jover ]
* Now using Standards-Version 3.9.2 (no changes needed).
+ * Switch to source format “3.0 (quilt)”.
+ - Remove quilt from Build-Depends.
+ - Remove patch target in debian/rules.
+ - Remove now unneeded README.source.
+ - Refresh all patches.
-- Robert Millan <rmh at debian.org> Thu, 13 Jan 2011 18:29:12 +0100
Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/control 2011-05-26 02:53:11 UTC (rev 3329)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 5.0.0), pmake, flex, bison, libbsd-dev, quilt
+Build-Depends: debhelper (>= 5.0.0), pmake, flex, bison, libbsd-dev
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-buildutils/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-buildutils/
Standards-Version: 3.9.2
Modified: trunk/freebsd-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/00_upstream.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/00_upstream.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,21 @@
+---
+ src/usr.bin/cksum/cksum.c | 1 +
+ src/usr.bin/cksum/extern.h | 1 +
+ src/usr.bin/make/main.c | 2 ++
+ src/usr.sbin/config/main.c | 7 +++++++
+ src/usr.sbin/mtree/compare.c | 16 ++++++++++------
+ src/usr.sbin/mtree/create.c | 18 +++++++++++++++---
+ src/usr.sbin/mtree/extern.h | 3 +++
+ src/usr.sbin/mtree/misc.c | 2 ++
+ src/usr.sbin/mtree/mtree.h | 14 +++++++++++++-
+ src/usr.sbin/mtree/spec.c | 10 +++++++---
+ src/usr.sbin/mtree/specspec.c | 4 +++-
+ src/usr.sbin/mtree/verify.c | 2 ++
+ 12 files changed, 66 insertions(+), 14 deletions(-)
+
--- a/src/usr.bin/cksum/cksum.c
+++ b/src/usr.bin/cksum/cksum.c
-@@ -57,6 +57,7 @@
+@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -20,7 +35,7 @@
int crc(int, uint32_t *, off_t *);
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -914,6 +914,7 @@
+@@ -914,6 +914,7 @@ main(int argc, char **argv)
}
#endif
@@ -28,7 +43,7 @@
/*
* Prior to 7.0, FreeBSD/pc98 kernel used to set the
* utsname.machine to "i386", and MACHINE was defined as
-@@ -933,6 +934,7 @@
+@@ -933,6 +934,7 @@ main(int argc, char **argv)
machine = "pc98";
}
}
@@ -38,7 +53,7 @@
* Get the name of this type of MACHINE from utsname
--- a/src/usr.sbin/config/main.c
+++ b/src/usr.sbin/config/main.c
-@@ -56,6 +56,9 @@
+@@ -56,6 +56,9 @@ static const char rcsid[] =
#include <sysexits.h>
#include <unistd.h>
#include <dirent.h>
@@ -48,7 +63,7 @@
#include "y.tab.h"
#include "config.h"
#include "configvers.h"
-@@ -605,7 +608,11 @@
+@@ -618,7 +621,11 @@ cleanheaders(char *p)
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
@@ -62,7 +77,7 @@
continue;
--- a/src/usr.sbin/mtree/compare.c
+++ b/src/usr.sbin/mtree/compare.c
-@@ -176,21 +176,22 @@
+@@ -176,21 +176,22 @@ typeerr: LABEL;
(intmax_t)s->st_size, (intmax_t)p->fts_statp->st_size);
tab = "\t";
}
@@ -91,7 +106,7 @@
tv[1] = tv[0];
if (utimes(p->fts_accpath, tv))
(void)printf(" not modified: %s\n",
-@@ -201,6 +202,7 @@
+@@ -201,6 +202,7 @@ typeerr: LABEL;
(void)printf("\n");
tab = "\t";
}
@@ -99,7 +114,7 @@
if (s->flags & F_CKSUM) {
if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0) {
LABEL;
-@@ -223,6 +225,7 @@
+@@ -223,6 +225,7 @@ typeerr: LABEL;
}
}
}
@@ -107,7 +122,7 @@
if ((s->flags & F_FLAGS) && s->st_flags != p->fts_statp->st_flags) {
LABEL;
fflags = flags_to_string(s->st_flags);
-@@ -243,6 +246,7 @@
+@@ -243,6 +246,7 @@ typeerr: LABEL;
(void)printf("\n");
tab = "\t";
}
@@ -117,7 +132,7 @@
char *new_digest, buf[33];
--- a/src/usr.sbin/mtree/create.c
+++ b/src/usr.sbin/mtree/create.c
-@@ -73,7 +73,11 @@
+@@ -73,7 +73,11 @@ static mode_t mode;
static u_long flags = 0xffffffff;
static int dsort(const FTSENT * const *, const FTSENT * const *);
@@ -130,7 +145,7 @@
static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *);
static void statf(int, FTSENT *);
-@@ -211,10 +215,12 @@
+@@ -211,10 +215,12 @@ statf(int indent, FTSENT *p)
if (keys & F_SIZE)
output(indent, &offset, "size=%jd",
(intmax_t)p->fts_statp->st_size);
@@ -145,7 +160,7 @@
if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
crc(fd, &val, &len))
-@@ -265,11 +271,13 @@
+@@ -265,11 +271,13 @@ statf(int indent, FTSENT *p)
if (keys & F_SLINK &&
(p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE))
output(indent, &offset, "link=%s", rlink(p->fts_accpath));
@@ -159,7 +174,7 @@
(void)putchar('\n');
}
-@@ -328,6 +336,7 @@
+@@ -328,6 +336,7 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
maxuid = u[suid];
}
@@ -167,7 +182,7 @@
/*
* XXX
* note that the below will break when file flags
-@@ -341,6 +350,7 @@
+@@ -341,6 +350,7 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
saveflags = sflags;
maxflags = f[FLAGS2IDX(sflags)];
}
@@ -175,7 +190,7 @@
}
}
/*
-@@ -384,11 +394,13 @@
+@@ -384,11 +394,13 @@ statd(FTS *t, FTSENT *parent, uid_t *pui
(void)printf(" mode=%#o", savemode);
if (keys & F_NLINK)
(void)printf(" nlink=1");
@@ -203,7 +218,7 @@
#ifdef _FTS_H_
--- a/src/usr.sbin/mtree/misc.c
+++ b/src/usr.sbin/mtree/misc.c
-@@ -107,6 +107,7 @@
+@@ -107,6 +107,7 @@ keycompare(const void *a, const void *b)
return (strcmp(((const KEY *)a)->name, ((const KEY *)b)->name));
}
@@ -211,14 +226,14 @@
char *
flags_to_string(u_long fflags)
{
-@@ -122,3 +123,4 @@
+@@ -122,3 +123,4 @@ flags_to_string(u_long fflags)
return string;
}
+#endif /* __FreeBSD__ */
--- a/src/usr.sbin/mtree/mtree.h
+++ b/src/usr.sbin/mtree/mtree.h
-@@ -42,7 +42,16 @@
+@@ -42,7 +42,16 @@ typedef struct _node {
struct _node *parent, *child; /* up, down */
struct _node *prev, *next; /* left, right */
off_t st_size; /* size */
@@ -236,7 +251,7 @@
u_long cksum; /* check sum */
char *md5digest; /* MD5 digest */
char *sha1digest; /* SHA-1 digest */
-@@ -51,6 +60,9 @@
+@@ -51,6 +60,9 @@ typedef struct _node {
char *slink; /* symbolic link reference */
uid_t st_uid; /* uid */
gid_t st_gid; /* gid */
@@ -248,7 +263,7 @@
u_long st_flags; /* flags */
--- a/src/usr.sbin/mtree/spec.c
+++ b/src/usr.sbin/mtree/spec.c
-@@ -204,12 +204,14 @@
+@@ -204,12 +204,14 @@ set(char *t, NODE *ip)
if(!ip->rmd160digest)
errx(1, "strdup");
break;
@@ -263,7 +278,7 @@
case F_GID:
ip->st_gid = strtoul(val, &ep, 10);
if (*ep)
-@@ -252,20 +254,22 @@
+@@ -252,20 +254,22 @@ set(char *t, NODE *ip)
if (strunvis(ip->slink, val) == -1)
errx(1, "symlink %s is ill-encoded", val);
break;
@@ -291,7 +306,7 @@
case 'b':
--- a/src/usr.sbin/mtree/specspec.c
+++ b/src/usr.sbin/mtree/specspec.c
-@@ -150,8 +150,10 @@
+@@ -150,8 +150,10 @@ compare_nodes(NODE *n1, NODE *n2, char c
differs |= F_SIZE;
if (FS(n1, n2, F_SLINK, slink))
differs |= F_SLINK;
@@ -305,7 +320,7 @@
if (FF(n1, n2, F_UNAME, st_uid))
--- a/src/usr.sbin/mtree/verify.c
+++ b/src/usr.sbin/mtree/verify.c
-@@ -251,9 +251,11 @@
+@@ -251,9 +251,11 @@ miss(NODE *p, char *tail)
if (chmod(path, p->st_mode))
(void)printf("%s: permissions not set: %s\n",
path, strerror(errno));
Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,14 @@
+---
+ src/share/mk/bsd.incs.mk | 6 +++---
+ src/share/mk/bsd.info.mk | 16 +++-------------
+ src/share/mk/bsd.lib.mk | 18 +++++++++---------
+ src/share/mk/bsd.man.mk | 8 ++++----
+ src/share/mk/bsd.own.mk | 8 ++++----
+ 5 files changed, 23 insertions(+), 33 deletions(-)
+
--- a/src/share/mk/bsd.incs.mk
+++ b/src/share/mk/bsd.incs.mk
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ ${group}NAME_${header:T}?= ${header:T}
.endif
installincludes: _${group}INS_${header:T}
_${group}INS_${header:T}: ${header}
@@ -9,7 +17,7 @@
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -53,10 +53,10 @@
+@@ -53,10 +53,10 @@ _${group}INCS+= ${header}
installincludes: _${group}INS
_${group}INS: ${_${group}INCS}
.if defined(${group}NAME)
@@ -24,7 +32,7 @@
.endif
--- a/src/share/mk/bsd.info.mk
+++ b/src/share/mk/bsd.info.mk
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ MAKEINFO?= makeinfo
MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression
SRCDIR?= ${.CURDIR}
INFODIRFILE?= dir
@@ -33,7 +41,7 @@
INSTALLINFOFLAGS+=--quiet
INFOSECTION?= Miscellaneous
ICOMPRESS_CMD?= ${COMPRESS_CMD}
-@@ -143,18 +143,8 @@
+@@ -143,18 +143,8 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
.for x in ${INFO}
INSTALLINFODIRS+= ${x:S/$/-install/}
${x:S/$/-install/}:
@@ -56,7 +64,7 @@
.PHONY: ${INSTALLINFODIRS}
--- a/src/share/mk/bsd.lib.mk
+++ b/src/share/mk/bsd.lib.mk
-@@ -161,9 +161,9 @@
+@@ -161,9 +161,9 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -68,7 +76,7 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -178,9 +178,9 @@
+@@ -178,9 +178,9 @@ lib${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
@@ -80,7 +88,7 @@
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -197,16 +197,16 @@
+@@ -197,16 +197,16 @@ ${SHLIB_NAME}: ${SOBJS}
@${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${.TARGET} ${SHLIB_LINK}
.if defined(SHLIB_LINK)
@@ -100,7 +108,7 @@
.endif
.if defined(CTFMERGE)
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -276,11 +276,11 @@
+@@ -276,11 +276,11 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -116,7 +124,7 @@
.if defined(SHLIB_NAME)
--- a/src/share/mk/bsd.man.mk
+++ b/src/share/mk/bsd.man.mk
-@@ -211,12 +211,12 @@
+@@ -211,12 +211,12 @@ _maninstall: ${MAN}
[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
esac; \
name=$$1; shift; sect=$$1; shift; \
@@ -131,7 +139,7 @@
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
-@@ -226,12 +226,12 @@
+@@ -226,12 +226,12 @@ _maninstall: ${MAN}
[123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
esac; \
name=$$1; shift; sect=$$1; shift; \
@@ -166,7 +174,7 @@
#
# SHAREMODE ASCII text file mode. [${NOBINMODE}]
#
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ SRCCONF?= /etc/src.conf
# Binaries
BINOWN?= root
@@ -175,7 +183,7 @@
BINMODE?= 555
NOBINMODE?= 444
-@@ -139,7 +139,7 @@
+@@ -139,7 +139,7 @@ LIBMODE?= ${NOBINMODE}
# Share files
SHAREDIR?= /usr/share
SHAREOWN?= root
Modified: trunk/freebsd-buildutils/debian/patches/02_libbsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/02_libbsd.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/02_libbsd.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,28 @@
+---
+ src/share/mk/version_gen.awk | 2 +-
+ src/usr.bin/file2c/Makefile | 1 +
+ src/usr.bin/file2c/file2c.c | 1 +
+ src/usr.bin/make/Makefile | 1 +
+ src/usr.bin/make/arch.c | 3 ++-
+ src/usr.bin/make/dir.h | 2 +-
+ src/usr.bin/make/job.c | 3 ++-
+ src/usr.bin/make/main.c | 3 ++-
+ src/usr.bin/make/shell.c | 2 +-
+ src/usr.bin/make/shell.h | 2 +-
+ src/usr.bin/make/suff.c | 2 +-
+ src/usr.bin/yacc/test/ftp.tab.c | 6 +++---
+ src/usr.bin/yacc/test/ftp.y | 6 +++---
+ src/usr.sbin/config/Makefile | 2 +-
+ src/usr.sbin/config/config.h | 2 +-
+ src/usr.sbin/config/mkoptions.c | 1 +
+ src/usr.sbin/mtree/Makefile | 1 +
+ src/usr.sbin/mtree/excludes.c | 3 ++-
+ src/usr.sbin/mtree/spec.c | 1 +
+ 19 files changed, 27 insertions(+), 17 deletions(-)
+
--- a/src/share/mk/version_gen.awk
+++ b/src/share/mk/version_gen.awk
-@@ -41,7 +41,7 @@
+@@ -43,7 +43,7 @@ BEGIN {
version_count = 0;
current_version = "";
stderr = "/dev/stderr";
@@ -30,7 +52,7 @@
.include <bsd.prog.mk>
--- a/src/usr.bin/make/arch.c
+++ b/src/usr.bin/make/arch.c
-@@ -88,7 +88,8 @@
+@@ -88,7 +88,8 @@ __FBSDID("$FreeBSD$");
*/
#include <sys/param.h>
@@ -53,7 +75,7 @@
struct GNode;
--- a/src/usr.bin/make/job.c
+++ b/src/usr.bin/make/job.c
-@@ -101,7 +101,8 @@
+@@ -101,7 +101,8 @@ __FBSDID("$FreeBSD$");
* thems as need creatin'
*/
@@ -65,7 +87,7 @@
#include <sys/stat.h>
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -65,7 +65,8 @@
+@@ -65,7 +65,8 @@ __FBSDID("$FreeBSD$");
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/time.h>
@@ -99,7 +121,7 @@
#include "util.h"
--- a/src/usr.bin/make/suff.c
+++ b/src/usr.bin/make/suff.c
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ __FBSDID("$FreeBSD$");
* if the target had no implicit sources.
*/
@@ -110,7 +132,7 @@
#include <stdlib.h>
--- a/src/usr.bin/make/Makefile
+++ b/src/usr.bin/make/Makefile
-@@ -7,6 +7,7 @@
+@@ -7,6 +7,7 @@ CFLAGS+=-I${.CURDIR}
SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
util.c var.c
@@ -120,7 +142,7 @@
NO_SHARED?= YES
--- a/src/usr.bin/yacc/test/ftp.tab.c
+++ b/src/usr.bin/yacc/test/ftp.tab.c
-@@ -490,10 +490,10 @@
+@@ -490,10 +490,10 @@ lookup(p, cmd)
#include <arpa/telnet.h>
/*
@@ -133,7 +155,7 @@
char *s;
register FILE *iop;
{
-@@ -584,7 +584,7 @@
+@@ -584,7 +584,7 @@ yylex()
case CMD:
(void) signal(SIGALRM, toolong);
(void) alarm((unsigned) timeout);
@@ -144,7 +166,7 @@
}
--- a/src/usr.bin/yacc/test/ftp.y
+++ b/src/usr.bin/yacc/test/ftp.y
-@@ -750,10 +750,10 @@
+@@ -750,10 +750,10 @@ lookup(p, cmd)
#include <arpa/telnet.h>
/*
@@ -157,7 +179,7 @@
char *s;
register FILE *iop;
{
-@@ -844,7 +844,7 @@
+@@ -844,7 +844,7 @@ yylex()
case CMD:
(void) signal(SIGALRM, toolong);
(void) alarm((unsigned) timeout);
@@ -179,7 +201,7 @@
--- a/src/usr.sbin/config/mkoptions.c
+++ b/src/usr.sbin/config/mkoptions.c
-@@ -40,6 +40,7 @@
+@@ -40,6 +40,7 @@ static const char rcsid[] =
* Make all the .h files for the optional entries
*/
@@ -189,7 +211,7 @@
#include <stdio.h>
--- a/src/usr.sbin/config/Makefile
+++ b/src/usr.sbin/config/Makefile
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ WARNS?= 6
CFLAGS+= -I. -I${.CURDIR}
DPADD= ${LIBL} ${LIBSBUF}
@@ -200,7 +222,7 @@
--- a/src/usr.sbin/mtree/excludes.c
+++ b/src/usr.sbin/mtree/excludes.c
-@@ -32,7 +32,8 @@
+@@ -32,7 +32,8 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/time.h> /* XXX for mtree.h */
@@ -212,7 +234,7 @@
#include <fnmatch.h>
--- a/src/usr.sbin/mtree/spec.c
+++ b/src/usr.sbin/mtree/spec.c
-@@ -35,6 +35,7 @@
+@@ -35,6 +35,7 @@ static char sccsid[] = "@(#)spec.c 8.1 (
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -222,8 +244,8 @@
#include <ctype.h>
--- a/src/usr.sbin/mtree/Makefile
+++ b/src/usr.sbin/mtree/Makefile
-@@ -7,6 +7,7 @@
- MAN= mtree.8
+@@ -7,6 +7,7 @@ PROG= mtree
+ MAN= mtree.8 mtree.5
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
SRCS+= specspec.c
+LDADD= -lbsd
Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,25 @@
+---
+ src/usr.bin/make/cond.c | 4 ++--
+ src/usr.bin/make/job.c | 4 ++--
+ src/usr.bin/make/parse.c | 12 ++++++------
+ src/usr.bin/make/proc.h | 2 +-
+ src/usr.bin/make/shell.c | 2 +-
+ src/usr.bin/make/util.c | 2 +-
+ src/usr.bin/make/util.h | 8 ++++----
+ src/usr.bin/make/var.c | 8 ++++----
+ src/usr.bin/yacc/defs.h | 3 +++
+ src/usr.bin/yacc/main.c | 4 ++--
+ src/usr.sbin/btxld/btx.h | 1 +
+ src/usr.sbin/btxld/elfh.c | 1 +
+ src/usr.sbin/btxld/elfh.h | 2 +-
+ src/usr.sbin/mtree/Makefile | 4 ----
+ src/usr.sbin/mtree/compare.c | 2 +-
+ src/usr.sbin/mtree/specspec.c | 2 --
+ 16 files changed, 30 insertions(+), 31 deletions(-)
+
--- a/src/usr.sbin/mtree/specspec.c
+++ b/src/usr.sbin/mtree/specspec.c
-@@ -84,8 +84,6 @@
+@@ -84,8 +84,6 @@ shownode(NODE *n, int f, char const *pat
printf(" rmd160digest=%s", n->rmd160digest);
if (f & F_SHA256)
printf(" sha256digest=%s", n->sha256digest);
@@ -11,7 +30,7 @@
--- a/src/usr.bin/make/cond.c
+++ b/src/usr.bin/make/cond.c
-@@ -1115,7 +1115,7 @@
+@@ -1115,7 +1115,7 @@ Cond_If(char *line, int code, int lineno
* Handle .else statement.
*/
void
@@ -20,7 +39,7 @@
{
while (isspace((u_char)*line))
-@@ -1156,7 +1156,7 @@
+@@ -1156,7 +1156,7 @@ Cond_Else(char *line __unused, int code
* Handle .endif statement.
*/
void
@@ -31,7 +50,7 @@
while (isspace((u_char)*line))
--- a/src/usr.bin/make/job.c
+++ b/src/usr.bin/make/job.c
-@@ -474,7 +474,7 @@
+@@ -479,7 +479,7 @@ mkfifotemp(char *template)
}
static void
@@ -40,7 +59,7 @@
{
}
-@@ -2190,7 +2190,7 @@
+@@ -2195,7 +2195,7 @@ Job_CatchChildren(Boolean block)
*/
void
#ifdef USE_KQUEUE
@@ -51,7 +70,7 @@
#endif
--- a/src/usr.bin/make/parse.c
+++ b/src/usr.bin/make/parse.c
-@@ -2210,13 +2210,13 @@
+@@ -2210,13 +2210,13 @@ xparse_include(char *file, int sinclude)
}
static void
@@ -67,7 +86,7 @@
{
xparse_include(file, 1);
}
-@@ -2230,7 +2230,7 @@
+@@ -2230,7 +2230,7 @@ parse_sinclude(char *file, int code __un
* a warning if the directive is malformed.
*/
static void
@@ -76,7 +95,7 @@
{
if (!isspace((u_char)*line)) {
-@@ -2257,7 +2257,7 @@
+@@ -2257,7 +2257,7 @@ parse_message(char *line, int iserror, i
* Parse an .undef directive.
*/
static void
@@ -85,7 +104,7 @@
{
char *cp;
-@@ -2279,7 +2279,7 @@
+@@ -2279,7 +2279,7 @@ parse_undef(char *line, int code __unuse
* Parse a .for directive.
*/
static void
@@ -94,7 +113,7 @@
{
if (!For_For(line)) {
-@@ -2311,7 +2311,7 @@
+@@ -2311,7 +2311,7 @@ parse_for(char *line, int code __unused,
* Parse endfor. This may only happen if there was no matching .for.
*/
static void
@@ -105,7 +124,7 @@
Parse_Error(PARSE_FATAL, "for-less endfor");
--- a/src/usr.bin/make/proc.h
+++ b/src/usr.bin/make/proc.h
-@@ -48,6 +48,6 @@
+@@ -48,6 +48,6 @@ typedef struct ProcStuff {
pid_t child_pid;
} ProcStuff;
@@ -115,7 +134,7 @@
#endif /* proc_h_458845848 */
--- a/src/usr.bin/make/shell.c
+++ b/src/usr.bin/make/shell.c
-@@ -120,7 +120,7 @@
+@@ -120,7 +120,7 @@ struct Shell *commandShell;
*/
static struct Shells shells = TAILQ_HEAD_INITIALIZER(shells);
@@ -126,7 +145,7 @@
* Helper function for sorting the builtin list alphabetically.
--- a/src/usr.bin/make/util.c
+++ b/src/usr.bin/make/util.c
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
#include "targ.h"
#include "util.h"
@@ -137,7 +156,7 @@
* Debug --
--- a/src/usr.bin/make/util.h
+++ b/src/usr.bin/make/util.h
-@@ -103,10 +103,10 @@
+@@ -103,10 +103,10 @@ do { \
void Debug(const char *, ...);
void DebugM(const char *, ...);
void Error(const char *, ...);
@@ -154,7 +173,7 @@
void *erealloc(void *, size_t);
--- a/src/usr.bin/make/var.c
+++ b/src/usr.bin/make/var.c
-@@ -248,7 +248,7 @@
+@@ -248,7 +248,7 @@ VarDestroy(Var *v, Boolean f)
* The trimmed word is added to the buffer.
*/
static Boolean
@@ -163,7 +182,7 @@
{
char *slash;
-@@ -283,7 +283,7 @@
+@@ -283,7 +283,7 @@ VarHead(const char *word, Boolean addSpa
* The trimmed word is added to the buffer.
*/
static Boolean
@@ -172,7 +191,7 @@
{
const char *slash;
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ VarTail(const char *word, Boolean addSpa
* The suffix from the word is placed in the buffer.
*/
static Boolean
@@ -181,7 +200,7 @@
{
const char *dot;
-@@ -340,7 +340,7 @@
+@@ -340,7 +340,7 @@ VarSuffix(const char *word, Boolean addS
* The trimmed word is added to the buffer.
*/
static Boolean
@@ -192,7 +211,7 @@
--- a/src/usr.bin/yacc/main.c
+++ b/src/usr.bin/yacc/main.c
-@@ -114,7 +114,7 @@
+@@ -114,7 +114,7 @@ static void usage(void);
volatile sig_atomic_t sigdie;
@@ -201,7 +220,7 @@
done(k)
int k;
{
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,7 @@ int k;
static void
onintr(signo)
@@ -212,7 +231,7 @@
done(1);
--- a/src/usr.sbin/mtree/compare.c
+++ b/src/usr.sbin/mtree/compare.c
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
}
int
@@ -254,7 +273,7 @@
Elf32_Ehdr e; /* ELF header */
--- a/src/usr.sbin/mtree/Makefile
+++ b/src/usr.sbin/mtree/Makefile
-@@ -11,8 +11,4 @@
+@@ -11,8 +11,4 @@ LDADD= -lbsd
WARNS?= 4
Modified: trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/04_sys_endian.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,13 @@
+---
+ src/usr.sbin/btxld/btxld.c | 1 -
+ src/usr.sbin/btxld/elfh.c | 1 -
+ src/usr.sbin/kgzip/elfhdr.c | 1 -
+ src/usr.sbin/kgzip/kgzld.c | 1 -
+ 4 files changed, 4 deletions(-)
+
--- a/src/usr.sbin/btxld/btxld.c
+++ b/src/usr.sbin/btxld/btxld.c
-@@ -30,7 +30,6 @@
+@@ -30,7 +30,6 @@ static const char rcsid[] =
#endif /* not lint */
#include <sys/param.h>
Modified: trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,9 @@
+---
+ src/usr.bin/cksum/Makefile | 2 +-
+ src/usr.bin/lex/Makefile | 6 +++---
+ src/usr.bin/yacc/Makefile | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
--- a/src/usr.bin/cksum/Makefile
+++ b/src/usr.bin/cksum/Makefile
@@ -3,7 +3,7 @@
@@ -26,7 +32,7 @@
skel.c sym.c tblcmp.c yylex.c
--- a/src/usr.bin/yacc/Makefile
+++ b/src/usr.bin/yacc/Makefile
-@@ -6,7 +6,7 @@
+@@ -6,7 +6,7 @@ SRCS= closure.c error.c lalr.c lr0.c mai
skeleton.c symtab.c verbose.c warshall.c
SCRIPTS=yyfix.sh
MAN= yacc.1 yyfix.1
Modified: trunk/freebsd-buildutils/debian/patches/07_brandelf.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/07_brandelf.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/07_brandelf.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,8 @@
+---
+ src/usr.bin/brandelf/brandelf.c | 2
+ src/usr.bin/brandelf/elf_common.h | 299 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 300 insertions(+), 1 deletion(-)
+
--- a/src/usr.bin/brandelf/brandelf.c
+++ b/src/usr.bin/brandelf/brandelf.c
@@ -31,7 +31,7 @@
Modified: trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,16 @@
+---
+ src/usr.bin/make/arch.c | 4 ++++
+ src/usr.bin/make/main.c | 3 +++
+ src/usr.sbin/config/main.c | 4 ++++
+ src/usr.sbin/config/mkmakefile.c | 4 ++++
+ src/usr.sbin/config/mkoptions.c | 4 ++++
+ src/usr.sbin/mtree/create.c | 4 ++++
+ src/usr.sbin/mtree/extern.h | 5 +++--
+ 7 files changed, 26 insertions(+), 2 deletions(-)
+
--- a/src/usr.bin/make/arch.c
+++ b/src/usr.bin/make/arch.c
-@@ -190,6 +190,10 @@
+@@ -192,6 +192,10 @@ Boolean arch_fatal = TRUE;
Error ARGS; \
} while (0)
@@ -13,7 +23,7 @@
* Arch_ParseArchive --
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -248,6 +248,9 @@
+@@ -249,6 +249,9 @@ ReadMakefile(const char p[])
{
char *fname, *fnamesave; /* makefile to read */
FILE *stream;
@@ -25,7 +35,7 @@
int setMAKEFILE;
--- a/src/usr.sbin/config/main.c
+++ b/src/usr.sbin/config/main.c
-@@ -71,6 +71,10 @@
+@@ -71,6 +71,10 @@ static const char rcsid[] =
#define FALSE (0)
#endif
@@ -38,7 +48,7 @@
char * PREFIX;
--- a/src/usr.sbin/config/mkmakefile.c
+++ b/src/usr.sbin/config/mkmakefile.c
-@@ -65,6 +65,10 @@
+@@ -65,6 +65,10 @@ static const char rcsid[] =
wd = word; \
}
@@ -51,7 +61,7 @@
static void do_rules(FILE *);
--- a/src/usr.sbin/config/mkoptions.c
+++ b/src/usr.sbin/config/mkoptions.c
-@@ -49,6 +49,10 @@
+@@ -49,6 +49,10 @@ static const char rcsid[] =
#include "config.h"
#include "y.tab.h"
@@ -64,7 +74,7 @@
int u_min;
--- a/src/usr.sbin/mtree/create.c
+++ b/src/usr.sbin/mtree/create.c
-@@ -67,6 +67,10 @@
+@@ -67,6 +67,10 @@ __FBSDID("$FreeBSD$");
#define INDENTNAMELEN 15
#define MAXLINELEN 80
@@ -77,7 +87,7 @@
static mode_t mode;
--- a/src/usr.sbin/mtree/extern.h
+++ b/src/usr.sbin/mtree/extern.h
-@@ -57,6 +57,7 @@
+@@ -57,6 +57,7 @@ extern int ftsoptions;
extern u_int keys;
extern int lineno;
extern int dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, wflag;
Modified: trunk/freebsd-buildutils/debian/patches/09_ports_path.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/09_ports_path.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/09_ports_path.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,12 @@
+---
+ ports/Mk/bsd.port.mk | 24 ++++++++++++------------
+ src/share/mk/bsd.port.mk | 2 +-
+ src/share/mk/bsd.port.subdir.mk | 2 +-
+ 3 files changed, 14 insertions(+), 14 deletions(-)
+
--- a/ports/Mk/bsd.port.mk
+++ b/ports/Mk/bsd.port.mk
-@@ -3484,7 +3484,7 @@
+@@ -3487,7 +3487,7 @@ check-vulnerable:
.if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
@if [ -f "${AUDITFILE}" ]; then \
audit_created=`${_EXTRACT_AUDITFILE} | \
@@ -9,7 +15,7 @@
audit_expiry=`/bin/date -u -v-14d "+%Y%m%d"`; \
if [ "$$audit_created" -lt "$$audit_expiry" ]; then \
${ECHO_MSG} "===> WARNING: Vulnerability database out of date, checking anyway"; \
-@@ -3588,7 +3588,7 @@
+@@ -3591,7 +3591,7 @@ do-fetch:
@cd ${_DISTDIR};\
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
@@ -18,7 +24,7 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
force_fetch=false; \
filebasename=$${file##*/}; \
-@@ -4665,7 +4665,7 @@
+@@ -4732,7 +4732,7 @@ fetch-list:
@(cd ${_DISTDIR}; \
${_MASTER_SITES_ENV} ; \
for _file in ${DISTFILES}; do \
@@ -27,7 +33,7 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -f $$file -a ! -f $${file##*/} ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -4702,7 +4702,7 @@
+@@ -4769,7 +4769,7 @@ fetch-list:
@(cd ${_DISTDIR}; \
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
@@ -36,7 +42,7 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -f $$file -a ! -f $${file##*/} ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -4738,7 +4738,7 @@
+@@ -4805,7 +4805,7 @@ fetch-url-list-int:
@(cd ${_DISTDIR}; \
${_MASTER_SITES_ENV}; \
for _file in ${DISTFILES}; do \
@@ -45,7 +51,7 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -4769,7 +4769,7 @@
+@@ -4836,7 +4836,7 @@ fetch-url-list-int:
@(cd ${_DISTDIR}; \
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
@@ -54,7 +60,7 @@
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
if [ ! -z "$$select" ] ; then \
-@@ -5155,7 +5155,7 @@
+@@ -5222,7 +5222,7 @@ lib-depends:
.if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
@for i in ${LIB_DEPENDS}; do \
lib=$${i%%:*}; \
@@ -63,7 +69,7 @@
dir=$${i#*:}; \
target=$${i##*:}; \
if ${TEST} $$dir = $$target; then \
-@@ -5419,7 +5419,7 @@
+@@ -5486,7 +5486,7 @@ build-depends-list:
.endif
BUILD-DEPENDS-LIST= \
@@ -72,7 +78,7 @@
if [ -d $$dir ]; then \
${ECHO_CMD} $$dir; \
else \
-@@ -5768,7 +5768,7 @@
+@@ -5767,7 +5767,7 @@ generate-plist:
done
@${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST}
.endif
@@ -81,7 +87,7 @@
${ECHO_CMD} "@unexec rm -f %D/$$i %D/$${i%.gz} %D/$${i%.bz2} %D/$$i.gz %D/$$i.bz2" >> ${TMPPLIST}; \
done
.endfor
-@@ -5826,7 +5826,7 @@
+@@ -5822,7 +5822,7 @@ ${TMPPLIST}:
add-plist-docs:
.if defined(PORTDOCS) && !defined(NOPORTDOCS)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -90,7 +96,7 @@
${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
fi
.for x in ${PORTDOCS}
-@@ -5849,7 +5849,7 @@
+@@ -5845,7 +5845,7 @@ add-plist-docs:
add-plist-examples:
.if defined(PORTEXAMPLES) && !defined(NOPORTEXAMPLES)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
@@ -99,7 +105,7 @@
${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
fi
.for x in ${PORTEXAMPLES}
-@@ -5873,7 +5873,7 @@
+@@ -5869,7 +5869,7 @@ add-plist-examples:
add-plist-data:
.if defined(PORTDATA) && !defined(NOPORTDATA)
@if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \
Modified: trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ src/usr.bin/make/main.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -943,11 +943,7 @@
+@@ -949,11 +949,7 @@ main(int argc, char **argv)
* run-time.
*/
if (machine == NULL) {
Modified: trunk/freebsd-buildutils/debian/patches/11_optreset.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/11_optreset.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/11_optreset.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ src/usr.bin/make/main.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
--- a/src/usr.bin/make/main.c
+++ b/src/usr.bin/make/main.c
-@@ -147,6 +147,8 @@
+@@ -148,6 +148,8 @@ uint32_t warn_nocmd; /* command line no-
time_t now; /* Time at start of make */
struct GNode *DEFAULT; /* .DEFAULT node */
@@ -9,7 +13,7 @@
/**
* Exit with usage message.
*/
-@@ -380,7 +382,7 @@
+@@ -381,7 +383,7 @@ rearg:
if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
found_dd = TRUE;
}
Modified: trunk/freebsd-buildutils/debian/patches/14_config.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/14_config.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/14_config.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,10 @@
+---
+ src/sys/kern/subr_sbuf.c | 4 ++--
+ src/sys/sys/sbuf.h | 9 ++++-----
+ src/usr.sbin/config/Makefile | 4 ++--
+ src/usr.sbin/config/main.c | 2 ++
+ 4 files changed, 10 insertions(+), 9 deletions(-)
+
--- a/src/sys/sys/sbuf.h
+++ b/src/sys/sys/sbuf.h
@@ -31,7 +31,8 @@
@@ -10,7 +17,7 @@
/*
* Structure definition
-@@ -64,10 +65,8 @@
+@@ -64,10 +65,8 @@ int sbuf_bcat(struct sbuf *, const voi
int sbuf_bcpy(struct sbuf *, const void *, size_t);
int sbuf_cat(struct sbuf *, const char *);
int sbuf_cpy(struct sbuf *, const char *);
@@ -25,7 +32,7 @@
int sbuf_overflowed(struct sbuf *);
--- a/src/sys/kern/subr_sbuf.c
+++ b/src/sys/kern/subr_sbuf.c
-@@ -77,8 +77,8 @@
+@@ -77,8 +77,8 @@ static MALLOC_DEFINE(M_SBUF, "sbuf", "st
#define SBUF_CLEARFLAG(s, f) do { (s)->s_flags &= ~(f); } while (0)
#define SBUF_MINEXTENDSIZE 16 /* Should be power of 2. */
@@ -47,7 +54,7 @@
kernconf.c: kernconf.tmpl
file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
-@@ -13,7 +13,7 @@
+@@ -13,7 +13,7 @@ WARNS?= 6
CFLAGS+= -I. -I${.CURDIR}
DPADD= ${LIBL} ${LIBSBUF}
@@ -58,7 +65,7 @@
--- a/src/usr.sbin/config/main.c
+++ b/src/usr.sbin/config/main.c
-@@ -43,6 +43,8 @@
+@@ -43,6 +43,8 @@ static const char rcsid[] =
#include <sys/types.h>
#include <sys/stat.h>
Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ src/share/mk/bsd.own.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/src/share/mk/bsd.own.mk
+++ b/src/share/mk/bsd.own.mk
-@@ -171,7 +171,7 @@
+@@ -169,7 +169,7 @@ INCLUDEDIR?= /usr/include
STRIP?= -s
.endif
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-buildutils/debian/rules 2011-05-26 02:53:11 UTC (rev 3329)
@@ -55,10 +55,8 @@
tar --numeric-owner --owner 0 --group 0 -czf ../freebsd-buildutils_$(VERSION).orig.tar.gz $(ORIGDIR)
rm -rf $(ORIGDIR)
-include /usr/share/quilt/quilt.make
-
unpack: unpack-stamp
-unpack-stamp: debian/stamp-patched
+unpack-stamp:
mkdir build-tree
cp -a src ports build-tree/
set -e ; for i in \
@@ -144,7 +142,7 @@
done
rmdir $(CURDIR)/debian/$(package)/usr/sbin
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf build-tree
Added: trunk/freebsd-buildutils/debian/source/format
===================================================================
--- trunk/freebsd-buildutils/debian/source/format (rev 0)
+++ trunk/freebsd-buildutils/debian/source/format 2011-05-26 02:53:11 UTC (rev 3329)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: trunk/freebsd-libs/debian/README.source
===================================================================
--- trunk/freebsd-libs/debian/README.source 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/README.source 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/changelog 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,6 +5,11 @@
[ Guillem Jover ]
* Now using Standards-Version 3.9.2 (no changes needed).
+ * Switch to source format “3.0 (quilt)”.
+ - Remove quilt from Build-Depends.
+ - Remove patch target in debian/rules.
+ - Remove now unneeded README.source.
+ - Refresh all patches.
-- Robert Millan <rmh at debian.org> Mon, 10 Jan 2011 16:01:31 +0100
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/control 2011-05-26 02:53:11 UTC (rev 3329)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 7), quilt, freebsd-buildutils,
+Build-Depends: debhelper (>= 7), freebsd-buildutils,
libbsd-dev (>= 0.1.4) [kfreebsd-any],
libc0.1-dev (>= 2.10) [kfreebsd-any],
libgdbm-dev [kfreebsd-any],
Modified: trunk/freebsd-libs/debian/patches/01_sys_cam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/patches/01_sys_cam.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,15 +1,14 @@
---
+ sys/cam/ata/ata_all.c | 2 +-
sys/cam/cam.c | 1 +
sys/cam/cam_xpt.c | 2 +-
sys/cam/scsi/scsi_all.c | 1 +
sys/cam/scsi/scsi_all.h | 2 ++
- 4 files changed, 5 insertions(+), 1 deletion(-)
+ 5 files changed, 6 insertions(+), 2 deletions(-)
-Index: freebsd-libs/sys/cam/cam.c
-===================================================================
---- freebsd-libs.orig/sys/cam/cam.c 2009-11-14 09:30:58.000000000 +0000
-+++ freebsd-libs/sys/cam/cam.c 2009-11-14 09:32:53.000000000 +0000
-@@ -36,6 +36,7 @@
+--- a/sys/cam/cam.c
++++ b/sys/cam/cam.c
+@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#else /* _KERNEL */
#include <stdlib.h>
@@ -17,24 +16,20 @@
#include <stdio.h>
#include <camlib.h>
#endif /* _KERNEL */
-Index: freebsd-libs/sys/cam/cam_xpt.c
-===================================================================
---- freebsd-libs.orig/sys/cam/cam_xpt.c 2009-11-14 09:30:58.000000000 +0000
-+++ freebsd-libs/sys/cam/cam_xpt.c 2009-11-14 09:32:53.000000000 +0000
-@@ -210,7 +210,7 @@
- static union ccb *xpt_get_ccb(struct cam_ed *device);
+--- a/sys/cam/cam_xpt.c
++++ b/sys/cam/cam_xpt.c
+@@ -221,7 +221,7 @@ static union ccb *xpt_get_ccb(struct cam
static void xpt_run_dev_allocq(struct cam_eb *bus);
+ static void xpt_run_dev_sendq(struct cam_eb *bus);
static timeout_t xpt_release_devq_timeout;
-static void xpt_release_simq_timeout(void *arg) __unused;
+static void xpt_release_simq_timeout(void *arg);
static void xpt_release_bus(struct cam_eb *bus);
- static void xpt_release_devq_device(struct cam_ed *dev, u_int count,
- int run_queue);
-Index: freebsd-libs/sys/cam/scsi/scsi_all.c
-===================================================================
---- freebsd-libs.orig/sys/cam/scsi/scsi_all.c 2009-11-14 09:30:58.000000000 +0000
-+++ freebsd-libs/sys/cam/scsi/scsi_all.c 2009-11-14 09:32:53.000000000 +0000
-@@ -41,6 +41,7 @@
+ static void xpt_release_devq_device(struct cam_ed *dev, cam_rl rl,
+ u_int count, int run_queue);
+--- a/sys/cam/scsi/scsi_all.c
++++ b/sys/cam/scsi/scsi_all.c
+@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#else
#include <errno.h>
@@ -42,10 +37,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-Index: freebsd-libs/sys/cam/scsi/scsi_all.h
-===================================================================
---- freebsd-libs.orig/sys/cam/scsi/scsi_all.h 2009-11-14 09:30:58.000000000 +0000
-+++ freebsd-libs/sys/cam/scsi/scsi_all.h 2009-11-14 09:32:53.000000000 +0000
+--- a/sys/cam/scsi/scsi_all.h
++++ b/sys/cam/scsi/scsi_all.h
@@ -32,6 +32,8 @@
* bus reset.
*/
@@ -55,11 +48,9 @@
#endif /* _KERNEL */
/*
-Index: freebsd-libs/sys/cam/ata/ata_all.c
-===================================================================
---- freebsd-libs.orig/sys/cam/ata/ata_all.c 2009-11-14 09:33:07.000000000 +0000
-+++ freebsd-libs/sys/cam/ata/ata_all.c 2009-11-14 09:33:15.000000000 +0000
-@@ -53,7 +53,7 @@
+--- a/sys/cam/ata/ata_all.c
++++ b/sys/cam/ata/ata_all.c
+@@ -53,7 +53,7 @@ __FBSDID("$FreeBSD$");
#include <sys/ata.h>
#include <cam/ata/ata_all.h>
#include <sys/sbuf.h>
Modified: trunk/freebsd-libs/debian/patches/02_libcam.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/02_libcam.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/patches/02_libcam.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -6,8 +6,8 @@
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
-@@ -5,8 +5,7 @@
- SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
+@@ -6,8 +6,7 @@ SRCS= camlib.c scsi_cmdparse.c scsi_all
+ ata_all.c
INCS= camlib.h
-DPADD= ${LIBSBUF}
@@ -18,7 +18,7 @@
--- a/lib/libcam/camlib.h
+++ b/lib/libcam/camlib.h
-@@ -150,13 +150,11 @@
+@@ -150,13 +150,11 @@ int cam_get_device(const char *path, c
/*
* Buffer encoding/decoding routines, from the old SCSI library.
*/
@@ -34,7 +34,7 @@
int buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
void (*arg_put)(void *, int, void *, int, char *),
void *puthook);
-@@ -168,8 +166,7 @@
+@@ -168,8 +166,7 @@ int csio_build_visit(struct ccb_scsiio *
int timeout, const char *cmd_spec,
int (*arg_get)(void *hook, char *field_name),
void *gethook);
@@ -46,7 +46,7 @@
void *gethook);
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
#include <errno.h>
#include <ctype.h>
Modified: trunk/freebsd-libs/debian/patches/05_libipx.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/05_libipx.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/patches/05_libipx.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,7 +5,7 @@
--- a/lib/libipx/Makefile
+++ b/lib/libipx/Makefile
@@ -1,6 +1,7 @@
- # $FreeBSD: src/lib/libipx/Makefile,v 1.7.30.1 2009/04/15 03:14:26 kensmith Exp $
+ # $FreeBSD$
LIB= ipx
+SHLIB_MAJOR= 2
Modified: trunk/freebsd-libs/debian/patches/08_libdevstat.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/patches/08_libdevstat.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,11 +1,11 @@
---
lib/libdevstat/Makefile | 4 ++--
- lib/libdevstat/devstat.c | 10 +++++++---
- 2 files changed, 9 insertions(+), 5 deletions(-)
+ lib/libdevstat/devstat.c | 6 +++++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ SRCS= devstat.c
INCS= devstat.h
DPADD= ${LIBKVM}
@@ -14,7 +14,7 @@
MAN= devstat.3
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ MLINKS+=devstat.3 buildmatch.3
MLINKS+=devstat.3 compute_stats.3
MLINKS+=devstat.3 compute_etime.3
@@ -25,7 +25,7 @@
--- a/lib/libdevstat/devstat.c
+++ b/lib/libdevstat/devstat.c
-@@ -44,6 +44,7 @@
+@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include <stdarg.h>
#include <kvm.h>
#include <nlist.h>
@@ -33,7 +33,7 @@
#include "devstat.h"
-@@ -1588,6 +1589,7 @@
+@@ -1589,6 +1590,7 @@ get_devstat_kvm(kvm_t *kd)
struct devstatlist dhead;
int num_devs;
char *rv = NULL;
@@ -41,7 +41,7 @@
if ((num_devs = devstat_getnumdevs(kd)) <= 0)
return(NULL);
-@@ -1615,9 +1617,11 @@
+@@ -1616,9 +1618,11 @@ get_devstat_kvm(kvm_t *kd)
return(NULL);
}
nds = &ds;
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-libs/debian/rules 2011-05-26 02:53:11 UTC (rev 3329)
@@ -48,11 +48,6 @@
tar -czf ../freebsd-libs_$(VERSION).orig.tar.gz $(ORIGDIR)
rm -rf $(ORIGDIR)
-patch: patch-stamp
-patch-stamp:
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- touch $@
-
ifeq ($(kernel), kfreebsd)
build: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph
else
@@ -60,57 +55,57 @@
endif
build-cam: build-cam-stamp
-build-cam-stamp: patch build-sbuf
+build-cam-stamp: build-sbuf
$(PMAKE) -C $(CURDIR)/lib/libcam SHLIBDIR=./
touch $@
build-geom: build-geom-stamp
-build-geom-stamp: patch build-sbuf
+build-geom-stamp: build-sbuf
$(PMAKE) -C $(CURDIR)/lib/libgeom SHLIBDIR=./
touch $@
build-netgraph: build-netgraph-stamp
-build-netgraph-stamp: patch
+build-netgraph-stamp:
$(PMAKE) -C $(CURDIR)/lib/libnetgraph SHLIBDIR=./
touch $@
build-ipx: build-ipx-stamp
-build-ipx-stamp: patch
+build-ipx-stamp:
$(PMAKE) -C $(CURDIR)/lib/libipx SHLIBDIR=./
touch $@
build-kiconv: build-kiconv-stamp
-build-kiconv-stamp: patch
+build-kiconv-stamp:
$(PMAKE) -C $(CURDIR)/lib/libkiconv SHLIBDIR=./
touch $@
build-kvm: build-kvm-stamp
-build-kvm-stamp: patch
+build-kvm-stamp:
$(PMAKE) -C $(CURDIR)/lib/libkvm SHLIBDIR=./
touch $@
build-devstat: build-devstat-stamp
-build-devstat-stamp: patch build-kvm
+build-devstat-stamp: build-kvm
$(PMAKE) -C $(CURDIR)/lib/libdevstat SHLIBDIR=./
touch $@
build-memstat: build-memstat-stamp
-build-memstat-stamp: patch build-kvm
+build-memstat-stamp: build-kvm
$(PMAKE) -C $(CURDIR)/lib/libmemstat SHLIBDIR=./
touch $@
build-sbuf: build-sbuf-stamp
-build-sbuf-stamp: patch
+build-sbuf-stamp:
$(PMAKE) -C $(CURDIR)/lib/libsbuf SHLIBDIR=./
touch $@
build-usbhid: build-usbhid-stamp
-build-usbhid-stamp: patch
+build-usbhid-stamp:
$(PMAKE) -C $(CURDIR)/lib/libusbhid SHLIBDIR=./
touch $@
build-usb: build-usb-stamp
-build-usb-stamp: patch
+build-usb-stamp:
$(PMAKE) -C $(CURDIR)/lib/libusb SHLIBDIR=./
touch $@
@@ -130,8 +125,6 @@
$(PMAKE) -C $(CURDIR)/lib/libusbhid clean
$(PMAKE) -C $(CURDIR)/lib/libusb clean
endif
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -rf .pc
rm -f *stamp
dh_clean
Added: trunk/freebsd-libs/debian/source/format
===================================================================
--- trunk/freebsd-libs/debian/source/format (rev 0)
+++ trunk/freebsd-libs/debian/source/format 2011-05-26 02:53:11 UTC (rev 3329)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: trunk/freebsd-utils/debian/README.source
===================================================================
--- trunk/freebsd-utils/debian/README.source 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/README.source 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/changelog 2011-05-26 02:53:11 UTC (rev 3329)
@@ -20,6 +20,11 @@
* Translate mount -f (--fake) to -d in the wrapper.
* Now using Standards-Version 3.9.2 (no changes needed).
* Move local headers to debian/include/.
+ * Switch to source format “3.0 (quilt)”.
+ - Remove quilt from Build-Depends.
+ - Remove patch target in debian/rules.
+ - Remove now unneeded README.source.
+ - Refresh all patches.
-- Robert Millan <rmh at debian.org> Wed, 09 Feb 2011 17:42:15 +0100
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/control 2011-05-26 02:53:11 UTC (rev 3329)
@@ -3,7 +3,7 @@
Priority: important
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 7), quilt, po-debconf, freebsd-buildutils,
+Build-Depends: debhelper (>= 7), po-debconf, freebsd-buildutils,
libkvm-dev (>= 8.2),
libbsd-dev (>= 0.2.0),
libc0.1-dev (>= 2.11.2),
Modified: trunk/freebsd-utils/debian/patches/001_dmesg.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/001_dmesg.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/001_dmesg.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ struct nlist nl[] = {
{ NULL, 0, 0, 0, 0 },
};
@@ -13,7 +13,7 @@
#define KREAD(addr, var) \
kvm_read(kd, addr, &var, sizeof(var)) != sizeof(var)
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ main(int argc, char *argv[])
all = 0;
(void) setlocale(LC_CTYPE, "");
memf = nlistf = NULL;
@@ -22,7 +22,7 @@
switch(ch) {
case 'a':
all++;
-@@ -97,6 +97,9 @@
+@@ -97,6 +97,9 @@ main(int argc, char *argv[])
case 'N':
nlistf = optarg;
break;
Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,23 +1,22 @@
---
- sbin/ifconfig/Makefile | 15 ++++++++-------
+ sbin/ifconfig/Makefile | 23 ++++++++++++-----------
sbin/ifconfig/af_atalk.c | 6 +++---
sbin/ifconfig/af_inet.c | 4 ++--
sbin/ifconfig/af_inet6.c | 17 +++++++++--------
sbin/ifconfig/af_ipx.c | 4 ++--
- sbin/ifconfig/af_link.c | 3 ++-
+ sbin/ifconfig/af_link.c | 4 +++-
+ sbin/ifconfig/af_nd6.c | 4 ++--
sbin/ifconfig/ifcarp.c | 1 +
sbin/ifconfig/ifclone.c | 3 ++-
- sbin/ifconfig/ifconfig.c | 25 ++++++++++++++++++-------
+ sbin/ifconfig/ifconfig.c | 37 ++++++++++++++++++++++++-------------
sbin/ifconfig/ifgre.c | 2 +-
- sbin/ifconfig/ifieee80211.c | 3 +++
+ sbin/ifconfig/ifieee80211.c | 4 ++++
sbin/ifconfig/ifvlan.c | 2 ++
- 12 files changed, 53 insertions(+), 32 deletions(-)
+ 13 files changed, 67 insertions(+), 44 deletions(-)
-Index: freebsd-utils/sbin/ifconfig/Makefile
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/Makefile 2009-12-07 06:05:36.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/Makefile 2010-06-29 08:26:23.000000000 +0000
-@@ -21,22 +21,22 @@
+--- a/sbin/ifconfig/Makefile
++++ b/sbin/ifconfig/Makefile
+@@ -21,22 +21,22 @@ SRCS+= af_atalk.c # AppleTalk support
SRCS+= af_nd6.c # ND6 support
SRCS+= ifclone.c # clone device support
@@ -51,7 +50,7 @@
.if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH)
SRCS+= af_ipx.c # IPX support
-@@ -47,6 +47,7 @@
+@@ -47,6 +47,7 @@ LDADD+= -lipx
MAN= ifconfig.8
CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs
@@ -59,10 +58,8 @@
WARNS?= 0
.include <bsd.prog.mk>
-Index: freebsd-utils/sbin/ifconfig/ifcarp.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/ifcarp.c 2010-02-07 06:22:28.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/ifcarp.c 2010-06-29 08:26:23.000000000 +0000
+--- a/sbin/ifconfig/ifcarp.c
++++ b/sbin/ifconfig/ifcarp.c
@@ -43,6 +43,7 @@
#include <ctype.h>
#include <stdio.h>
@@ -71,11 +68,9 @@
#include <stdlib.h>
#include <unistd.h>
#include <err.h>
-Index: freebsd-utils/sbin/ifconfig/ifconfig.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/ifconfig.c 2010-04-28 00:49:24.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/ifconfig.c 2010-06-29 08:28:37.000000000 +0000
-@@ -48,6 +48,11 @@
+--- a/sbin/ifconfig/ifconfig.c
++++ b/sbin/ifconfig/ifconfig.c
+@@ -48,6 +48,11 @@ static const char rcsid[] =
#include <sys/module.h>
#include <sys/linker.h>
@@ -87,7 +82,7 @@
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_var.h>
-@@ -66,7 +71,7 @@
+@@ -66,7 +71,7 @@ static const char rcsid[] =
#include <err.h>
#include <errno.h>
#include <fcntl.h>
@@ -96,7 +91,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-@@ -156,7 +161,7 @@
+@@ -156,7 +161,7 @@ main(int argc, char *argv[])
all = downonly = uponly = namesonly = noload = verbose = 0;
/* Parse leading line options */
@@ -105,7 +100,7 @@
for (p = opts; p != NULL; p = p->next)
strlcat(options, p->opt, sizeof(options));
while ((c = getopt(argc, argv, options)) != -1) {
-@@ -643,8 +648,9 @@
+@@ -643,8 +648,9 @@ deletetunnel(const char *vname, int para
err(1, "SIOCDIFPHYADDR");
}
@@ -116,7 +111,7 @@
const struct afswtch *afp)
{
struct ifreq my_ifr;
-@@ -658,7 +664,7 @@
+@@ -658,7 +664,7 @@ setifvnet(const char *jname, int dummy _
}
static void
@@ -125,7 +120,7 @@
const struct afswtch *afp)
{
struct ifreq my_ifr;
-@@ -671,8 +677,10 @@
+@@ -671,8 +677,10 @@ setifrvnet(const char *jname, int dummy
err(1, "SIOCSIFRVNET(%d, %s)", my_ifr.ifr_jid, my_ifr.ifr_name);
}
@@ -137,7 +132,7 @@
const struct afswtch *afp)
{
if (afp->af_getaddr != NULL) {
-@@ -682,7 +690,7 @@
+@@ -682,7 +690,7 @@ setifnetmask(const char *addr, int dummy
}
static void
@@ -146,7 +141,7 @@
const struct afswtch *afp)
{
if (afp->af_getaddr != NULL)
-@@ -690,7 +698,7 @@
+@@ -690,7 +698,7 @@ setifbroadaddr(const char *addr, int dum
}
static void
@@ -155,7 +150,7 @@
const struct afswtch *afp)
{
const struct afswtch *inet;
-@@ -723,7 +731,7 @@
+@@ -723,7 +731,7 @@ notealias(const char *addr, int param, i
/*ARGSUSED*/
static void
@@ -164,7 +159,7 @@
const struct afswtch *afp)
{
if (afp->af_getaddr != NULL)
-@@ -783,7 +791,7 @@
+@@ -783,7 +791,7 @@ setifcap(const char *vname, int value, i
}
static void
@@ -173,7 +168,7 @@
const struct afswtch *afp)
{
strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-@@ -793,7 +801,7 @@
+@@ -793,7 +801,7 @@ setifmetric(const char *val, int dummy _
}
static void
@@ -182,7 +177,7 @@
const struct afswtch *afp)
{
strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-@@ -803,7 +811,7 @@
+@@ -803,7 +811,7 @@ setifmtu(const char *val, int dummy __un
}
static void
@@ -191,7 +186,7 @@
const struct afswtch *afp)
{
char *newname;
-@@ -825,9 +833,10 @@
+@@ -825,9 +833,10 @@ setifname(const char *val, int dummy __u
/* ARGSUSED */
static void
@@ -203,7 +198,7 @@
char *newdescr;
ifr.ifr_buffer.length = strlen(val) + 1;
-@@ -902,7 +911,7 @@
+@@ -902,7 +911,7 @@ status(const struct afswtch *afp, const
putchar('\n');
for (;;) {
@@ -212,7 +207,7 @@
ifr.ifr_buffer.buffer = descr;
ifr.ifr_buffer.length = descrlen;
if (ioctl(s, SIOCGIFDESCR, &ifr) == 0) {
-@@ -1113,8 +1122,10 @@
+@@ -1113,8 +1122,10 @@ static struct cmd basic_cmds[] = {
DEF_CMD_ARG2("tunnel", settunnel),
DEF_CMD("-tunnel", 0, deletetunnel),
DEF_CMD("deletetunnel", 0, deletetunnel),
@@ -223,11 +218,9 @@
DEF_CMD("link0", IFF_LINK0, setifflags),
DEF_CMD("-link0", -IFF_LINK0, setifflags),
DEF_CMD("link1", IFF_LINK1, setifflags),
-Index: freebsd-utils/sbin/ifconfig/af_inet6.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/af_inet6.c 2009-12-07 06:05:36.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/af_inet6.c 2010-06-29 08:26:23.000000000 +0000
-@@ -42,7 +42,6 @@
+--- a/sbin/ifconfig/af_inet6.c
++++ b/sbin/ifconfig/af_inet6.c
+@@ -42,7 +42,6 @@ static const char rcsid[] =
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -235,7 +228,7 @@
#include <arpa/inet.h>
-@@ -53,6 +52,8 @@
+@@ -53,6 +52,8 @@ static const char rcsid[] =
#include <netdb.h>
#include <netinet6/nd6.h> /* Define ND6_INFINITE_LIFETIME */
@@ -244,7 +237,7 @@
#include "ifconfig.h"
-@@ -73,7 +74,7 @@
+@@ -73,7 +74,7 @@ extern void setnd6defif(const char *, in
static char addr_buf[MAXHOSTNAMELEN *2 + 1]; /*for getnameinfo()*/
static void
@@ -253,7 +246,7 @@
const struct afswtch *afp)
{
if (afp->af_getprefix != NULL)
-@@ -82,7 +83,7 @@
+@@ -82,7 +83,7 @@ setifprefixlen(const char *addr, int dum
}
static void
@@ -262,7 +255,7 @@
const struct afswtch *afp)
{
if (afp->af_af != AF_INET6)
-@@ -117,21 +118,21 @@
+@@ -117,21 +118,21 @@ setip6lifetime(const char *cmd, const ch
}
static void
@@ -287,7 +280,7 @@
const struct afswtch *afp)
{
struct ifaddrs *ifap, *ifa;
-@@ -177,7 +178,7 @@
+@@ -177,7 +178,7 @@ in6_fillscopeid(struct sockaddr_in6 *sin
}
static void
@@ -296,7 +289,7 @@
{
struct sockaddr_in6 *sin, null_sin;
struct in6_ifreq ifr6;
-@@ -527,7 +528,7 @@
+@@ -527,7 +528,7 @@ static struct afswtch af_inet6 = {
};
static void
@@ -305,11 +298,9 @@
{
ip6lifetime++; /* print IPv6 address lifetime */
}
-Index: freebsd-utils/sbin/ifconfig/ifclone.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/ifclone.c 2009-06-23 23:49:52.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/ifclone.c 2010-06-29 08:26:23.000000000 +0000
-@@ -42,6 +42,7 @@
+--- a/sbin/ifconfig/ifclone.c
++++ b/sbin/ifconfig/ifclone.c
+@@ -42,6 +42,7 @@ static const char rcsid[] =
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -317,7 +308,7 @@
#include <unistd.h>
#include "ifconfig.h"
-@@ -174,7 +175,7 @@
+@@ -174,7 +175,7 @@ static struct cmd clone_cmds[] = {
};
static void
@@ -326,11 +317,9 @@
{
list_cloners();
exit(0);
-Index: freebsd-utils/sbin/ifconfig/af_link.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/af_link.c 2007-02-24 23:55:46.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/af_link.c 2010-06-29 08:26:23.000000000 +0000
-@@ -46,13 +46,15 @@
+--- a/sbin/ifconfig/af_link.c
++++ b/sbin/ifconfig/af_link.c
+@@ -46,13 +46,15 @@ static const char rcsid[] =
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/ethernet.h>
@@ -347,10 +336,8 @@
{
/* XXX no const 'cuz LLADDR is defined wrong */
struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr;
-Index: freebsd-utils/sbin/ifconfig/ifieee80211.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/ifieee80211.c 2010-04-06 13:04:27.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/ifieee80211.c 2010-06-29 08:26:23.000000000 +0000
+--- a/sbin/ifconfig/ifieee80211.c
++++ b/sbin/ifconfig/ifieee80211.c
@@ -90,6 +90,10 @@
#include <fcntl.h>
#include <inttypes.h>
@@ -362,11 +349,9 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-Index: freebsd-utils/sbin/ifconfig/af_atalk.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/af_atalk.c 2009-06-23 23:49:52.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/af_atalk.c 2010-06-29 08:26:23.000000000 +0000
-@@ -55,7 +55,7 @@
+--- a/sbin/ifconfig/af_atalk.c
++++ b/sbin/ifconfig/af_atalk.c
+@@ -55,7 +55,7 @@ static struct ifaliasreq at_addreq;
/* XXX FIXME -- should use strtoul for better parsing. */
static void
@@ -375,7 +360,7 @@
const struct afswtch *afp)
{
u_int first = 123, last = 123;
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ setatrange(const char *range, int dummy
}
static void
@@ -384,7 +369,7 @@
const struct afswtch *afp)
{
if (!strcmp(phase, "1"))
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ setatphase(const char *phase, int dummy
}
static void
@@ -393,11 +378,9 @@
{
struct sockaddr_at *sat, null_sat;
struct netrange *nr;
-Index: freebsd-utils/sbin/ifconfig/af_inet.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/af_inet.c 2009-06-23 23:49:52.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/af_inet.c 2010-06-29 08:26:23.000000000 +0000
-@@ -42,13 +42,13 @@
+--- a/sbin/ifconfig/af_inet.c
++++ b/sbin/ifconfig/af_inet.c
+@@ -43,13 +43,13 @@ static const char rcsid[] =
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -412,7 +395,7 @@
#include "ifconfig.h"
-@@ -56,7 +56,7 @@
+@@ -57,7 +57,7 @@ static struct in_aliasreq in_addreq;
static struct ifreq in_ridreq;
static void
@@ -421,11 +404,9 @@
{
struct sockaddr_in *sin, null_sin;
-Index: freebsd-utils/sbin/ifconfig/af_ipx.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/af_ipx.c 2007-06-13 18:07:59.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/af_ipx.c 2010-06-29 08:26:23.000000000 +0000
-@@ -41,9 +41,9 @@
+--- a/sbin/ifconfig/af_ipx.c
++++ b/sbin/ifconfig/af_ipx.c
+@@ -41,9 +41,9 @@ static const char rcsid[] =
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -436,7 +417,7 @@
#define IPTUNNEL
#include <netipx/ipx.h>
#include <netipx/ipx_if.h>
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ static struct ifaliasreq ipx_addreq;
static struct ifreq ipx_ridreq;
static void
@@ -445,11 +426,9 @@
{
struct sockaddr_ipx *sipx, null_sipx;
-Index: freebsd-utils/sbin/ifconfig/ifgre.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/ifgre.c 2009-06-23 23:49:52.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/ifgre.c 2010-06-29 08:26:23.000000000 +0000
-@@ -65,7 +65,7 @@
+--- a/sbin/ifconfig/ifgre.c
++++ b/sbin/ifconfig/ifgre.c
+@@ -65,7 +65,7 @@ gre_status(int s)
}
static void
@@ -458,10 +437,8 @@
const struct afswtch *afp)
{
uint32_t grekey = atol(val);
-Index: freebsd-utils/sbin/ifconfig/ifvlan.c
-===================================================================
---- freebsd-utils.orig/sbin/ifconfig/ifvlan.c 2010-03-18 19:10:03.000000000 +0000
-+++ freebsd-utils/sbin/ifconfig/ifvlan.c 2010-06-29 08:26:23.000000000 +0000
+--- a/sbin/ifconfig/ifvlan.c
++++ b/sbin/ifconfig/ifvlan.c
@@ -52,6 +52,8 @@
#include <err.h>
#include <errno.h>
@@ -471,9 +448,9 @@
#include "ifconfig.h"
#ifndef lint
---- freebsd-utils.orig/sbin/ifconfig/af_nd6.c
-+++ freebsd-utils/sbin/ifconfig/af_nd6.c
-@@ -65,7 +65,7 @@
+--- a/sbin/ifconfig/af_nd6.c
++++ b/sbin/ifconfig/af_nd6.c
+@@ -65,7 +65,7 @@ void setnd6flags(const char *, int, int,
void setnd6defif(const char *, int, int, const struct afswtch *);
void
@@ -482,7 +459,7 @@
int d, int s,
const struct afswtch *afp)
{
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ setnd6flags(const char *dummyaddr __unus
}
void
Modified: trunk/freebsd-utils/debian/patches/003_kbdcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/003_kbdcontrol.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/003_kbdcontrol.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ void set_functionkey(char *keynumstr, c
void set_keyboard(char *device);
void set_keyrates(char *opt);
void show_kbd_info(void);
Modified: trunk/freebsd-utils/debian/patches/004_kldconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/004_kldconfig.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/004_kldconfig.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,12 +1,13 @@
---
+ sbin/kldconfig/Makefile | 1 +
sbin/kldconfig/kldconfig.c | 12 +++---------
- 1 file changed, 3 insertions(+), 9 deletions(-)
+ sbin/kldload/Makefile | 1 +
+ sbin/kldunload/Makefile | 1 +
+ 4 files changed, 6 insertions(+), 9 deletions(-)
-Index: freebsd-utils/sbin/kldconfig/kldconfig.c
-===================================================================
---- freebsd-utils.orig/sbin/kldconfig/kldconfig.c 2009-11-14 10:43:32.000000000 +0000
-+++ freebsd-utils/sbin/kldconfig/kldconfig.c 2009-11-14 10:44:33.000000000 +0000
-@@ -40,14 +40,8 @@
+--- a/sbin/kldconfig/kldconfig.c
++++ b/sbin/kldconfig/kldconfig.c
+@@ -40,14 +40,8 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
@@ -23,7 +24,7 @@
/* the default sysctl name */
#define PATHCTL "kern.module_path"
-@@ -208,7 +202,7 @@
+@@ -208,7 +202,7 @@ addpath(struct pathhead *pathq, char *pa
/* Remove a path component from the module search path */
static void
@@ -32,10 +33,8 @@
{
char pathbuf[MAXPATHLEN+1];
struct pathentry *pe;
-Index: freebsd-utils/sbin/kldconfig/Makefile
-===================================================================
---- freebsd-utils.orig/sbin/kldconfig/Makefile 2009-11-14 10:43:32.000000000 +0000
-+++ freebsd-utils/sbin/kldconfig/Makefile 2009-11-14 10:44:33.000000000 +0000
+--- a/sbin/kldconfig/Makefile
++++ b/sbin/kldconfig/Makefile
@@ -29,5 +29,6 @@
PROG= kldconfig
MAN= kldconfig.8
@@ -43,10 +42,8 @@
+LDADD= -lbsd
.include <bsd.prog.mk>
-Index: freebsd-utils/sbin/kldload/Makefile
-===================================================================
---- freebsd-utils.orig/sbin/kldload/Makefile 2009-11-14 10:44:52.000000000 +0000
-+++ freebsd-utils/sbin/kldload/Makefile 2009-11-14 10:45:23.000000000 +0000
+--- a/sbin/kldload/Makefile
++++ b/sbin/kldload/Makefile
@@ -29,5 +29,6 @@
PROG= kldload
MAN= kldload.8
@@ -54,10 +51,8 @@
+LDADD= -lbsd
.include <bsd.prog.mk>
-Index: freebsd-utils/sbin/kldunload/Makefile
-===================================================================
---- freebsd-utils.orig/sbin/kldunload/Makefile 2009-11-14 10:45:00.000000000 +0000
-+++ freebsd-utils/sbin/kldunload/Makefile 2009-11-14 10:45:33.000000000 +0000
+--- a/sbin/kldunload/Makefile
++++ b/sbin/kldunload/Makefile
@@ -28,6 +28,7 @@
PROG= kldunload
Modified: trunk/freebsd-utils/debian/patches/005_ktrace.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/005_ktrace.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/005_ktrace.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
-@@ -200,7 +200,7 @@
+@@ -200,7 +200,7 @@ usage(void)
}
static void
Modified: trunk/freebsd-utils/debian/patches/006_mdconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/006_mdconfig.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/006_mdconfig.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -9,7 +9,7 @@
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
-@@ -41,6 +41,7 @@
+@@ -41,6 +41,7 @@ static void usage(void);
static int md_find(char *, const char *);
static int md_query(char *name);
static int md_list(char *units, int opt);
@@ -17,7 +17,7 @@
static char *geom_config_get(struct gconf *g, char *name);
static void md_prthumanval(char *length);
-@@ -259,9 +260,7 @@
+@@ -269,9 +270,7 @@ main(int argc, char **argv)
}
mdio.md_version = MDIOVERSION;
@@ -28,7 +28,7 @@
fd = open("/dev/" MDCTL_NAME, O_RDWR, 0);
if (fd < 0)
err(1, "open(/dev/%s)", MDCTL_NAME);
-@@ -460,3 +459,21 @@
+@@ -471,3 +470,21 @@ md_query(char *name)
{
return (md_list(name, OPT_UNIT));
}
@@ -52,7 +52,7 @@
+}
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
-@@ -5,6 +5,6 @@
+@@ -5,6 +5,6 @@ MAN= mdconfig.8
MLINKS= mdconfig.8 vnconfig.8
DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,12 +1,13 @@
---
sbin/mount/Makefile | 2 +-
- sbin/mount/mount.c | 23 +++++++++++++----------
+ sbin/mount/mntopts.h | 4 ++++
+ sbin/mount/mount.c | 22 +++++++++++-----------
sbin/mount/mount_fs.c | 2 +-
- 3 files changed, 15 insertions(+), 12 deletions(-)
+ 4 files changed, 17 insertions(+), 13 deletions(-)
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
-@@ -37,6 +37,10 @@
+@@ -37,6 +37,10 @@ struct mntopt {
int m_altloc; /* 1 => set bit in altflags */
};
@@ -17,11 +18,9 @@
/* User-visible MNT_ flags. */
#define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 }
#define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 }
-Index: b/sbin/mount/mount_fs.c
-===================================================================
--- a/sbin/mount/mount_fs.c
+++ b/sbin/mount/mount_fs.c
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ static const char rcsid[] =
#include <sys/mount.h>
#include <err.h>
@@ -30,11 +29,9 @@
#include <libgen.h>
#include <stdio.h>
#include <stdlib.h>
-Index: b/sbin/mount/mount.c
-===================================================================
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
-@@ -58,6 +58,8 @@
+@@ -58,6 +58,8 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
#include <libutil.h>
@@ -43,7 +40,7 @@
#include "extern.h"
#include "mntopts.h"
#include "pathnames.h"
-@@ -159,6 +161,7 @@
+@@ -160,6 +162,7 @@ use_mountprog(const char *vfstype)
static int
exec_mountprog(const char *name, const char *execname, char *const argv[])
{
@@ -51,7 +48,7 @@
pid_t pid;
int status;
-@@ -167,13 +170,11 @@
+@@ -168,13 +171,11 @@ exec_mountprog(const char *name, const c
warn("fork");
exit (1);
case 0: /* Child. */
@@ -68,7 +65,7 @@
}
exit(1);
default: /* Parent. */
-@@ -250,7 +251,7 @@
+@@ -251,7 +252,7 @@ main(int argc, char *argv[])
options = NULL;
vfslist = NULL;
vfstype = "ufs";
@@ -77,7 +74,7 @@
switch (ch) {
case 'a':
all = 1;
-@@ -258,9 +259,6 @@
+@@ -259,9 +260,6 @@ main(int argc, char *argv[])
case 'd':
debug = 1;
break;
@@ -87,7 +84,7 @@
case 'f':
init_flags |= MNT_FORCE;
break;
-@@ -645,11 +643,13 @@
+@@ -646,11 +644,13 @@ prmount(struct statfs *sfp)
(void)printf(", reads: sync %ju async %ju",
(uintmax_t)sfp->f_syncreads,
(uintmax_t)sfp->f_asyncreads);
@@ -101,7 +98,7 @@
}
(void)printf(")\n");
}
-@@ -839,7 +839,7 @@
+@@ -840,7 +840,7 @@ usage(void)
{
(void)fprintf(stderr, "%s\n%s\n%s\n",
@@ -110,7 +107,7 @@
" mount [-dfpruvw] special | node",
" mount [-dfpruvw] [-o options] [-t ufs | external_type] special node");
exit(1);
-@@ -856,7 +856,7 @@
+@@ -865,7 +865,7 @@ putfsent(struct statfs *ent)
if (strncmp(ent->f_mntfromname, "<below>", 7) == 0 ||
strncmp(ent->f_mntfromname, "<above>", 7) == 0) {
@@ -119,11 +116,9 @@
+1));
}
-Index: b/sbin/mount/Makefile
-===================================================================
--- a/sbin/mount/Makefile
+++ b/sbin/mount/Makefile
-@@ -8,6 +8,6 @@
+@@ -8,6 +8,6 @@ MAN= mount.8
# We do NOT install the getmntopts.3 man page.
DPADD= ${LIBUTIL}
Modified: trunk/freebsd-utils/debian/patches/008_mount_hpfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/008_mount_hpfs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/008_mount_hpfs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ static struct mntopt mopts[] = {
static gid_t a_gid(char *);
static uid_t a_uid(char *);
static mode_t a_mask(char *);
Modified: trunk/freebsd-utils/debian/patches/009_mount_msdosfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/009_mount_msdosfs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/009_mount_msdosfs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ static const char rcsid[] =
#include <pwd.h>
#include <stdio.h>
/* must be after stdio to declare fparseln */
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ static const char rcsid[] =
static gid_t a_gid(char *);
static uid_t a_uid(char *);
static mode_t a_mask(char *);
Modified: trunk/freebsd-utils/debian/patches/010_mount_ntfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/010_mount_ntfs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/010_mount_ntfs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -20,7 +20,7 @@
#include "mntopts.h"
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ static struct mntopt mopts[] = {
static gid_t a_gid(char *);
static uid_t a_uid(char *);
static mode_t a_mask(char *);
Modified: trunk/freebsd-utils/debian/patches/011_mount_nullfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/011_mount_nullfs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/011_mount_nullfs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ struct mntopt mopts[] = {
};
int subdir(const char *, const char *);
Modified: trunk/freebsd-utils/debian/patches/012_mount_std.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/012_mount_std.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/012_mount_std.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
-@@ -63,10 +63,10 @@
+@@ -63,10 +63,10 @@ static struct mntopt mopts[] = {
static char *fsname;
static volatile sig_atomic_t caughtsig;
Modified: trunk/freebsd-utils/debian/patches/013_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/013_pf.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/013_pf.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -22,7 +22,7 @@
--- a/contrib/pf/authpf/authpf.c
+++ b/contrib/pf/authpf/authpf.c
-@@ -33,10 +33,11 @@
+@@ -33,10 +33,11 @@ __FBSDID("$FreeBSD$");
#include <err.h>
#include <errno.h>
@@ -36,7 +36,7 @@
#include <pwd.h>
#include <signal.h>
#include <stdio.h>
-@@ -70,10 +71,10 @@
+@@ -70,10 +71,10 @@ struct timeval Tstart, Tend; /* start an
volatile sig_atomic_t want_death;
static void need_death(int signo);
@@ -50,7 +50,7 @@
#endif
/*
-@@ -93,8 +94,9 @@
+@@ -93,8 +94,9 @@ main(int argc, char *argv[])
gid_t gid;
uid_t uid;
char *shell;
@@ -61,7 +61,7 @@
config = fopen(PATH_CONFFILE, "r");
if (config == NULL) {
syslog(LOG_ERR, "can not open %s (%m)", PATH_CONFFILE);
-@@ -140,15 +142,16 @@
+@@ -140,15 +142,16 @@ main(int argc, char *argv[])
syslog(LOG_ERR, "cannot find user for uid %u", uid);
goto die;
}
@@ -81,7 +81,7 @@
if (strcmp(shell, PATH_AUTHPF_SHELL)) {
syslog(LOG_ERR, "wrong shell for user %s, uid %u",
pw->pw_name, pw->pw_uid);
-@@ -318,7 +321,9 @@
+@@ -318,7 +321,9 @@ main(int argc, char *argv[])
while (1) {
printf("\r\nHello %s. ", luser);
printf("You are authenticated from host \"%s\"\r\n", ipsrc);
@@ -91,7 +91,7 @@
print_message(PATH_MESSAGE);
while (1) {
sleep(10);
-@@ -716,7 +721,7 @@
+@@ -716,7 +721,7 @@ change_filter(int add, const char *luser
syslog(LOG_INFO, "allowing %s, user %s", ipsrc, luser);
} else {
gettimeofday(&Tend, NULL);
@@ -100,7 +100,7 @@
syslog(LOG_INFO, "removed %s, user %s - duration %jd seconds",
ipsrc, luser, (intmax_t)(Tend.tv_sec - Tstart.tv_sec));
#else
-@@ -829,10 +834,10 @@
+@@ -829,10 +834,10 @@ need_death(int signo)
/*
* function that removes our stuff when we go away.
*/
@@ -116,7 +116,7 @@
{
--- a/contrib/pf/ftp-proxy/ftp-proxy.c
+++ b/contrib/pf/ftp-proxy/ftp-proxy.c
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ void client_read(struct bufferevent *, v
int drop_privs(void);
void end_session(struct session *);
int exit_daemon(void);
@@ -125,7 +125,7 @@
void handle_connection(const int, short, void *);
void handle_signal(int, short, void *);
struct session * init_session(void);
-@@ -229,7 +229,7 @@
+@@ -229,7 +229,7 @@ client_read(struct bufferevent *bufev, v
buf_avail);
s->cbuf_valid += read;
@@ -134,7 +134,7 @@
logmsg(LOG_DEBUG, "#%d client: %s", s->id, linebuf);
if (!client_parse(s)) {
end_session(s);
-@@ -305,7 +305,7 @@
+@@ -305,7 +305,7 @@ exit_daemon(void)
{
struct session *s, *next;
@@ -143,7 +143,7 @@
LIST_FOREACH_SAFE(s, &sessions, entry, next) {
#else
for (s = LIST_FIRST(&sessions); s != LIST_END(&sessions); s = next) {
-@@ -324,7 +324,7 @@
+@@ -324,7 +324,7 @@ exit_daemon(void)
}
int
@@ -152,7 +152,7 @@
{
size_t i;
-@@ -566,7 +566,7 @@
+@@ -566,7 +566,7 @@ logmsg(int pri, const char *message, ...
/* We don't care about truncation. */
vsnprintf(buf, sizeof buf, message, ap);
@@ -161,7 +161,7 @@
/* XXX: strnvis might be nice to have */
strvisx(visbuf, buf,
MIN((sizeof(visbuf) / 4) - 1, strlen(buf)),
-@@ -1053,7 +1053,7 @@
+@@ -1053,7 +1053,7 @@ server_read(struct bufferevent *bufev, v
buf_avail);
s->sbuf_valid += read;
@@ -183,7 +183,7 @@
#define INTPTR(x) x
--- a/contrib/pf/pfctl/parse.y
+++ b/contrib/pf/pfctl/parse.y
-@@ -57,12 +57,12 @@
+@@ -57,12 +57,12 @@ __FBSDID("$FreeBSD$");
#include <limits.h>
#include <pwd.h>
#include <grp.h>
@@ -198,7 +198,7 @@
#define HTONL(x) (x) = htonl((__uint32_t)(x))
#endif
-@@ -402,6 +402,7 @@
+@@ -402,6 +402,7 @@ typedef struct {
} v;
int lineno;
} YYSTYPE;
@@ -206,7 +206,7 @@
#define DYNIF_MULTIADDR(addr) ((addr).type == PF_ADDR_DYNIFTL && \
(!((addr).iflags & PFI_AFLAG_NOALIAS) || \
-@@ -1027,7 +1028,7 @@
+@@ -1027,7 +1028,7 @@ scrub_opt : NODF {
scrub_opts.randomid = 1;
}
| RTABLE number {
@@ -215,7 +215,7 @@
if ($2 > RT_TABLEID_MAX || $2 < 0) {
yyerror("invalid rtable id");
YYERROR;
-@@ -1172,7 +1173,7 @@
+@@ -1172,7 +1173,7 @@ antispoof_opt : label {
antispoof_opts.label = $1;
}
| RTABLE number {
@@ -224,7 +224,7 @@
if ($2 > RT_TABLEID_MAX || $2 < 0) {
yyerror("invalid rtable id");
YYERROR;
-@@ -2147,7 +2148,7 @@
+@@ -2155,7 +2156,7 @@ filter_opt : USER uids {
free($2);
}
| RTABLE number {
@@ -233,7 +233,7 @@
if ($2 > RT_TABLEID_MAX || $2 < 0) {
yyerror("invalid rtable id");
YYERROR;
-@@ -3452,7 +3453,7 @@
+@@ -3468,7 +3469,7 @@ redirection : /* empty */ { $$ = NULL;
}
;
@@ -242,7 +242,7 @@
natpass : /* empty */ { $$.b1 = $$.b2 = 0; $$.w2 = 0; }
| PASS { $$.b1 = 1; $$.b2 = 0; $$.w2 = 0; }
/* else
-@@ -3826,7 +3827,7 @@
+@@ -3842,7 +3843,7 @@ tagged : /* empty */ { $$.neg = 0; $$.
rtable : /* empty */ { $$ = -1; }
| RTABLE number {
@@ -253,7 +253,7 @@
#else
--- a/contrib/pf/pfctl/pfctl_altq.c
+++ b/contrib/pf/pfctl/pfctl_altq.c
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ static int gsc_add_seg(struct gen_sc *
double);
static double sc_x2y(struct service_curve *, double);
@@ -262,7 +262,7 @@
u_int32_t getifspeed(int, char *);
#else
u_int32_t getifspeed(char *);
-@@ -153,7 +153,7 @@
+@@ -153,7 +153,7 @@ print_altq(const struct pf_altq *a, unsi
return;
}
@@ -271,7 +271,7 @@
if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
printf("INACTIVE ");
#endif
-@@ -191,7 +191,7 @@
+@@ -191,7 +191,7 @@ print_queue(const struct pf_altq *a, uns
{
unsigned i;
@@ -280,7 +280,7 @@
if (a->local_flags & PFALTQ_FLAG_IF_REMOVED)
printf("INACTIVE ");
#endif
-@@ -237,7 +237,7 @@
+@@ -237,7 +237,7 @@ eval_pfaltq(struct pfctl *pf, struct pf_
if (bw->bw_absolute > 0)
pa->ifbandwidth = bw->bw_absolute;
else
@@ -289,7 +289,7 @@
if ((rate = getifspeed(pf->dev, pa->ifname)) == 0) {
#else
if ((rate = getifspeed(pa->ifname)) == 0) {
-@@ -1096,7 +1096,7 @@
+@@ -1096,7 +1096,7 @@ rate2str(double rate)
return (buf);
}
@@ -298,7 +298,7 @@
/*
* XXX
* FreeBSD does not have SIOCGIFDATA.
-@@ -1153,7 +1153,7 @@
+@@ -1153,7 +1153,7 @@ getifmtu(char *ifname)
sizeof(ifr.ifr_name))
errx(1, "getifmtu: strlcpy");
if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == -1)
@@ -309,7 +309,7 @@
err(1, "SIOCGIFMTU");
--- a/contrib/pf/pfctl/pfctl.c
+++ b/contrib/pf/pfctl/pfctl.c
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
#include "pfctl_parser.h"
#include "pfctl.h"
@@ -318,7 +318,7 @@
#define HTONL(x) (x) = htonl((__uint32_t)(x))
#endif
-@@ -250,7 +250,7 @@
+@@ -250,7 +250,7 @@ pfctl_enable(int dev, int opts)
if (ioctl(dev, DIOCSTART)) {
if (errno == EEXIST)
errx(1, "pf already enabled");
@@ -327,7 +327,7 @@
else if (errno == ESRCH)
errx(1, "pfil registeration failed");
#endif
-@@ -1895,7 +1895,7 @@
+@@ -1895,7 +1895,7 @@ pfctl_debug(int dev, u_int32_t level, in
int
pfctl_test_altqsupport(int dev, int opts)
{
@@ -336,7 +336,7 @@
return (0);
#else
struct pfioc_altq pa;
-@@ -2171,7 +2171,7 @@
+@@ -2171,7 +2171,7 @@ main(int argc, char *argv[])
/* turn off options */
opts &= ~ (PF_OPT_DISABLE | PF_OPT_ENABLE);
clearopt = showopt = debugopt = NULL;
@@ -360,7 +360,7 @@
enum { PFRB_TABLES = 1, PFRB_TSTATS, PFRB_ADDRS, PFRB_ASTATS,
PFRB_IFACES, PFRB_TRANS, PFRB_MAX };
struct pfr_buffer {
-@@ -89,7 +95,7 @@
+@@ -89,7 +95,7 @@ void warn_namespace_collision(const cha
int pfctl_show_ifaces(const char *, int);
FILE *pfctl_fopen(const char *, const char *);
@@ -371,7 +371,7 @@
--- a/contrib/pf/pfctl/pfctl_optimize.c
+++ b/contrib/pf/pfctl/pfctl_optimize.c
-@@ -860,7 +860,7 @@
+@@ -860,7 +860,7 @@ block_feedback(struct pfctl *pf, struct
break;
}
}
@@ -382,7 +382,7 @@
if (por2 == TAILQ_END(&block->sb_rules))
--- a/contrib/pf/pfctl/pfctl_parser.c
+++ b/contrib/pf/pfctl/pfctl_parser.c
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
@@ -391,7 +391,7 @@
#include <netinet/icmp6.h>
#include <net/pfvar.h>
#include <arpa/inet.h>
-@@ -60,6 +60,29 @@
+@@ -60,6 +60,29 @@ __FBSDID("$FreeBSD$");
#include <ifaddrs.h>
#include <unistd.h>
@@ -421,7 +421,7 @@
#include "pfctl_parser.h"
#include "pfctl.h"
-@@ -598,7 +621,7 @@
+@@ -598,7 +621,7 @@ print_status(struct pf_status *s, int op
printf("Limit Counters\n");
for (i = 0; i < LCNT_MAX; i++) {
printf(" %-25s %14lld ", pf_lcounters[i],
@@ -430,7 +430,7 @@
(unsigned long long)s->lcounters[i]);
#else
s->lcounters[i]);
-@@ -647,7 +670,7 @@
+@@ -647,7 +670,7 @@ print_src_node(struct pf_src_node *sn, i
sn->expire, min, sec);
}
printf(", %llu pkts, %llu bytes",
@@ -441,7 +441,7 @@
#else
--- a/contrib/pf/pfctl/pfctl_parser.h
+++ b/contrib/pf/pfctl/pfctl_parser.h
-@@ -158,7 +158,7 @@
+@@ -158,7 +158,7 @@ struct node_queue_opt {
} data;
};
@@ -452,7 +452,7 @@
* Absolutely this is not correct location to define this.
--- a/contrib/pf/pfctl/pfctl_qstats.c
+++ b/contrib/pf/pfctl/pfctl_qstats.c
-@@ -89,7 +89,7 @@
+@@ -89,7 +89,7 @@ pfctl_show_altq(int dev, const char *ifa
struct pf_altq_node *root = NULL, *node;
int nodes, dotitle = (opts & PF_OPT_SHOWALL);
@@ -461,7 +461,7 @@
if (!altqsupport)
return (-1);
#endif
-@@ -118,7 +118,7 @@
+@@ -118,7 +118,7 @@ pfctl_show_altq(int dev, const char *ifa
for (node = root; node != NULL; node = node->next) {
if (iface != NULL && strcmp(node->altq.ifname, iface))
continue;
@@ -470,7 +470,7 @@
if (node->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
continue;
#endif
-@@ -161,7 +161,7 @@
+@@ -161,7 +161,7 @@ pfctl_update_qstats(int dev, struct pf_a
warn("DIOCGETALTQ");
return (-1);
}
@@ -479,7 +479,7 @@
if (pa.altq.qid > 0 &&
!(pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED)) {
#else
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ pfctl_update_qstats(int dev, struct pf_a
pfctl_insert_altq_node(root, pa.altq, qstats);
}
}
@@ -488,7 +488,7 @@
else if (pa.altq.local_flags & PFALTQ_FLAG_IF_REMOVED) {
memset(&qstats.data, 0, sizeof(qstats.data));
if ((node = pfctl_find_altq_node(*root, pa.altq.qname,
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ pfctl_print_altq_nodestat(int dev, const
{
if (a->altq.qid == 0)
return;
@@ -499,7 +499,7 @@
#endif
--- a/contrib/pf/pfctl/pf_print_state.c
+++ b/contrib/pf/pfctl/pf_print_state.c
-@@ -35,7 +35,21 @@
+@@ -35,7 +35,21 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/socket.h>
@@ -521,7 +521,7 @@
#include <net/if.h>
#define TCPSTATES
#include <netinet/tcp_fsm.h>
-@@ -282,7 +296,7 @@
+@@ -282,7 +296,7 @@ print_state(struct pf_state *s, int opts
s->expire /= 60;
printf(", expires in %.2u:%.2u:%.2u", s->expire, min, sec);
printf(", %llu:%llu pkts, %llu:%llu bytes",
@@ -530,7 +530,7 @@
(unsigned long long)s->packets[0],
(unsigned long long)s->packets[1],
(unsigned long long)s->bytes[0],
-@@ -302,7 +316,7 @@
+@@ -304,7 +318,7 @@ print_state(struct pf_state *s, int opts
}
if (opts & PF_OPT_VERBOSE2) {
printf(" id: %016llx creatorid: %08x%s\n",
@@ -541,7 +541,7 @@
betoh64(s->id), ntohl(s->creatorid),
--- a/contrib/pf/pflogd/pflogd.c
+++ b/contrib/pf/pflogd/pflogd.c
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
#include <sys/ioctl.h>
#include <sys/file.h>
#include <sys/stat.h>
@@ -550,7 +550,7 @@
#include <net/bpf.h> /* BIOCLOCK */
#endif
#include <stdio.h>
-@@ -51,7 +51,7 @@
+@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <stdarg.h>
#include <fcntl.h>
@@ -559,7 +559,7 @@
#include "pidfile.h"
#else
#include <util.h>
-@@ -158,11 +158,6 @@
+@@ -158,11 +158,6 @@ logmsg(int pri, const char *message, ...
va_end(ap);
}
@@ -571,7 +571,7 @@
usage(void)
{
fprintf(stderr, "usage: pflogd [-Dx] [-d delay] [-f filename]");
-@@ -352,7 +347,7 @@
+@@ -352,7 +347,7 @@ int
scan_dump(FILE *fp, off_t size)
{
struct pcap_file_header hdr;
@@ -580,7 +580,7 @@
struct pcap_sf_pkthdr ph;
#else
struct pcap_pkthdr ph;
-@@ -425,7 +420,7 @@
+@@ -425,7 +420,7 @@ void
dump_packet_nobuf(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
{
FILE *f = (FILE *)user;
@@ -589,7 +589,7 @@
struct pcap_sf_pkthdr sh;
#endif
-@@ -434,7 +429,7 @@
+@@ -434,7 +429,7 @@ dump_packet_nobuf(u_char *user, const st
return;
}
@@ -598,7 +598,7 @@
sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
sh.caplen = h->caplen;
-@@ -447,7 +442,7 @@
+@@ -447,7 +442,7 @@ dump_packet_nobuf(u_char *user, const st
off_t pos = ftello(f);
/* try to undo header to prevent corruption */
@@ -607,7 +607,7 @@
if (pos < sizeof(sh) ||
ftruncate(fileno(f), pos - sizeof(sh))) {
#else
-@@ -522,7 +517,7 @@
+@@ -522,7 +517,7 @@ void
dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
{
FILE *f = (FILE *)user;
@@ -616,7 +616,7 @@
struct pcap_sf_pkthdr sh;
size_t len = sizeof(sh) + h->caplen;
#else
-@@ -555,7 +550,7 @@
+@@ -555,7 +550,7 @@ dump_packet(u_char *user, const struct p
}
append:
@@ -625,7 +625,7 @@
sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
sh.caplen = h->caplen;
-@@ -583,7 +578,7 @@
+@@ -583,7 +578,7 @@ main(int argc, char **argv)
pcap_handler phandler = dump_packet;
const char *errstr = NULL;
@@ -634,7 +634,7 @@
/* another ?paranoid? safety measure we do not have */
#else
closefrom(STDERR_FILENO + 1);
-@@ -690,7 +685,7 @@
+@@ -690,7 +685,7 @@ main(int argc, char **argv)
np = pcap_dispatch(hpcap, PCAP_NUM_PKTS,
phandler, (u_char *)dpcap);
if (np < 0) {
@@ -645,7 +645,7 @@
"Device not/no longer configured");
--- a/contrib/pf/pflogd/pidfile.c
+++ b/contrib/pf/pflogd/pidfile.c
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ static const char rcsid[] = "$OpenBSD: p
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -656,7 +656,7 @@
#include <util.h>
--- a/contrib/pf/pflogd/privsep.c
+++ b/contrib/pf/pflogd/privsep.c
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
@@ -665,7 +665,7 @@
#include <pcap.h>
#include <pcap-int.h>
#endif
-@@ -40,7 +40,7 @@
+@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -674,7 +674,7 @@
/* XXX: pcap pollutes namespace with strlcpy if not present previously */
#include <pcap.h>
#include <pcap-int.h>
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ priv_init(void)
int snaplen, ret, olderrno;
struct passwd *pw;
@@ -685,7 +685,7 @@
for (i = 1; i < _NSIG; i++)
--- a/contrib/pf/tftp-proxy/filter.c
+++ b/contrib/pf/tftp-proxy/filter.c
-@@ -298,7 +298,7 @@
+@@ -298,7 +298,7 @@ prepare_rule(u_int32_t id, int rs_num, s
pfr.rule.quick = 1;
pfr.rule.log = rule_log;
pfr.rule.keep_state = 1;
@@ -1211,7 +1211,7 @@
+
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ CFLAGS+= -DENABLE_ALTQ
YFLAGS=
@@ -1222,7 +1222,7 @@
.include <bsd.prog.mk>
--- a/usr.sbin/authpf/Makefile
+++ b/usr.sbin/authpf/Makefile
-@@ -16,7 +16,7 @@
+@@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/pf/p
# XXX ALTQ:
CFLAGS+= -DENABLE_ALTQ
Modified: trunk/freebsd-utils/debian/patches/014_route.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/014_route.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/014_route.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,12 +1,11 @@
---
- sbin/route/route.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ sbin/route/Makefile | 1 +
+ sbin/route/route.c | 7 +++++--
+ 2 files changed, 6 insertions(+), 2 deletions(-)
-Index: freebsd-utils/sbin/route/route.c
-===================================================================
---- freebsd-utils.orig/sbin/route/route.c 2009-04-14 23:05:36.000000000 +0000
-+++ freebsd-utils/sbin/route/route.c 2009-11-14 10:24:14.000000000 +0000
-@@ -63,10 +63,13 @@
+--- a/sbin/route/route.c
++++ b/sbin/route/route.c
+@@ -63,10 +63,13 @@ static const char rcsid[] =
#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
@@ -20,7 +19,7 @@
struct keytab {
char *kt_cp;
-@@ -110,7 +113,7 @@
+@@ -110,7 +113,7 @@ int getaddr(), rtmsg(), x25_makemask();
int prefixlen();
extern char *iso_ntoa();
@@ -29,7 +28,7 @@
void
usage(cp)
-@@ -134,7 +137,7 @@
+@@ -134,7 +137,7 @@ main(argc, argv)
if (argc < 2)
usage((char *)NULL);
@@ -38,11 +37,9 @@
switch(ch) {
case 'n':
nflag = 1;
-Index: freebsd-utils/sbin/route/Makefile
-===================================================================
---- freebsd-utils.orig/sbin/route/Makefile 2006-07-27 13:26:29.000000000 +0000
-+++ freebsd-utils/sbin/route/Makefile 2009-11-14 10:24:14.000000000 +0000
-@@ -7,6 +7,7 @@
+--- a/sbin/route/Makefile
++++ b/sbin/route/Makefile
+@@ -7,6 +7,7 @@ PROG= route
MAN= route.8
SRCS= route.c keywords.h
WARNS?= 0
Modified: trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -2,11 +2,9 @@
usr.sbin/rpc.umntall/rpc.umntall.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
-Index: freebsd-utils/usr.sbin/rpc.umntall/rpc.umntall.c
-===================================================================
---- freebsd-utils.orig/usr.sbin/rpc.umntall/rpc.umntall.c 2009-11-14 10:36:50.000000000 +0000
-+++ freebsd-utils/usr.sbin/rpc.umntall/rpc.umntall.c 2009-11-14 10:42:56.000000000 +0000
-@@ -176,8 +176,7 @@
+--- a/usr.sbin/rpc.umntall/rpc.umntall.c
++++ b/usr.sbin/rpc.umntall/rpc.umntall.c
+@@ -176,8 +176,7 @@ do_umntall(char *hostname) {
try.tv_sec = 3;
try.tv_usec = 0;
@@ -16,7 +14,7 @@
if (clp == NULL) {
warnx("%s: %s", hostname, clnt_spcreateerror("MOUNTPROG"));
return (0);
-@@ -204,13 +203,12 @@
+@@ -204,13 +203,12 @@ do_umount(char *hostname, char *dirp) {
try.tv_sec = 3;
try.tv_usec = 0;
Modified: trunk/freebsd-utils/debian/patches/016_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_swapon.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/016_swapon.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -3,14 +3,13 @@
something sane instead...
---
- sbin/swapon/swapon.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
+ sbin/swapon/Makefile | 2 +-
+ sbin/swapon/swapon.c | 13 +++++++++++--
+ 2 files changed, 12 insertions(+), 3 deletions(-)
-Index: freebsd-utils/sbin/swapon/swapon.c
-===================================================================
---- freebsd-utils.orig/sbin/swapon/swapon.c 2009-11-14 13:35:38.000000000 +0000
-+++ freebsd-utils/sbin/swapon/swapon.c 2009-11-14 13:40:51.000000000 +0000
-@@ -41,6 +41,7 @@
+--- a/sbin/swapon/swapon.c
++++ b/sbin/swapon/swapon.c
+@@ -41,6 +41,7 @@ static char sccsid[] = "@(#)swapon.c 8.1
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -18,7 +17,7 @@
#include <sys/stat.h>
#include <sys/param.h>
#include <sys/sysctl.h>
-@@ -51,7 +52,9 @@
+@@ -51,7 +52,9 @@ __FBSDID("$FreeBSD$");
#include <fstab.h>
#include <stdio.h>
#include <stdlib.h>
@@ -28,7 +27,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <libutil.h>
-@@ -71,6 +74,8 @@
+@@ -71,6 +74,8 @@ main(int argc, char **argv)
int ch, doall;
int sflag = 0, lflag = 0, hflag = 0, qflag = 0;
@@ -37,7 +36,7 @@
if ((ptr = strrchr(argv[0], '/')) == NULL)
ptr = argv[0];
if (strstr(ptr, "swapon"))
-@@ -80,7 +85,7 @@
+@@ -80,7 +85,7 @@ main(int argc, char **argv)
orig_prog = which_prog;
doall = 0;
@@ -46,7 +45,7 @@
switch(ch) {
case 'A':
if (which_prog == SWAPCTL) {
-@@ -132,6 +137,9 @@
+@@ -132,6 +137,9 @@ main(int argc, char **argv)
usage();
}
break;
@@ -56,7 +55,7 @@
case '?':
default:
usage();
-@@ -271,7 +279,8 @@
+@@ -271,7 +279,8 @@ swaplist(int lflag, int sflag, int hflag
hlen = 10;
break;
default:
@@ -66,11 +65,9 @@
snprintf(buf, sizeof(buf), "%ld-blocks", blocksize);
break;
}
-Index: freebsd-utils/sbin/swapon/Makefile
-===================================================================
---- freebsd-utils.orig/sbin/swapon/Makefile 2009-11-14 13:35:38.000000000 +0000
-+++ freebsd-utils/sbin/swapon/Makefile 2009-11-14 13:36:03.000000000 +0000
-@@ -9,6 +9,6 @@
+--- a/sbin/swapon/Makefile
++++ b/sbin/swapon/Makefile
+@@ -9,6 +9,6 @@ MLINKS= swapon.8 swapoff.8
MLINKS+=swapon.8 swapctl.8
DPADD= ${LIBUTIL}
Modified: trunk/freebsd-utils/debian/patches/017_sysctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/017_sysctl.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/017_sysctl.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,15 +4,15 @@
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
-@@ -57,6 +57,7 @@
+@@ -57,6 +57,7 @@ static const char rcsid[] =
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <time.h>
- static int aflag, bflag, dflag, eflag, hflag, Nflag, nflag, oflag;
- static int qflag, xflag;
-@@ -338,6 +339,7 @@
+ static int aflag, bflag, dflag, eflag, hflag, iflag;
+ static int Nflag, nflag, oflag, qflag, xflag, warncount;
+@@ -346,6 +347,7 @@ S_clockinfo(int l2, void *p)
static int
S_loadavg(int l2, void *p)
{
@@ -20,7 +20,7 @@
struct loadavg *tv = (struct loadavg*)p;
if (l2 != sizeof(*tv)) {
-@@ -348,6 +350,7 @@
+@@ -356,6 +358,7 @@ S_loadavg(int l2, void *p)
(double)tv->ldavg[0]/(double)tv->fscale,
(double)tv->ldavg[1]/(double)tv->fscale,
(double)tv->ldavg[2]/(double)tv->fscale);
Modified: trunk/freebsd-utils/debian/patches/018_umount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/018_umount.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/018_umount.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,7 +4,7 @@
--- a/sbin/umount/umount.c
+++ b/sbin/umount/umount.c
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ main(int argc, char *argv[])
sync();
all = errs = 0;
@@ -13,7 +13,7 @@
switch (ch) {
case 'A':
all = 2;
-@@ -102,9 +102,6 @@
+@@ -102,9 +102,6 @@ main(int argc, char *argv[])
case 'a':
all = 1;
break;
@@ -23,7 +23,7 @@
case 'f':
fflag = MNT_FORCE;
break;
-@@ -160,7 +157,7 @@
+@@ -160,7 +157,7 @@ main(int argc, char *argv[])
break;
case 1:
if (setfsent() == 0)
@@ -32,7 +32,7 @@
errs = umountall(typelist);
break;
case 0:
-@@ -199,9 +196,6 @@
+@@ -199,9 +196,6 @@ umountall(char **typelist)
strcmp(fs->fs_type, FSTAB_RO) &&
strcmp(fs->fs_type, FSTAB_RQ))
continue;
@@ -42,7 +42,7 @@
if (checkvfsname(fs->fs_vfstype, typelist))
continue;
-@@ -351,24 +345,12 @@
+@@ -358,24 +352,12 @@ umountfs(struct statfs *sfs)
if (!namematch(ai))
return (1);
@@ -69,16 +69,16 @@
/* Mark this this file system as unmounted. */
getmntentry(NULL, NULL, &sfs->f_fsid, REMOVE);
if (vflag)
-@@ -385,7 +367,7 @@
- clnt_spcreateerror("RPCPROG_MNT"));
+@@ -392,7 +374,7 @@ umountfs(struct statfs *sfs)
+ clnt_spcreateerror("MOUNTPROG"));
return (1);
}
- clp->cl_auth = authsys_create_default();
+ clp->cl_auth = authunix_create_default();
try.tv_sec = 20;
try.tv_usec = 0;
- clnt_stat = clnt_call(clp, RPCMNT_UMOUNT, (xdrproc_t)xdr_dir,
-@@ -592,6 +574,6 @@
+ clnt_stat = clnt_call(clp, MOUNTPROC_UMNT, (xdrproc_t)xdr_dir,
+@@ -600,6 +582,6 @@ usage()
(void)fprintf(stderr, "%s\n%s\n",
"usage: umount [-fv] special | node | fsid",
Modified: trunk/freebsd-utils/debian/patches/020_lib.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/020_lib.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/020_lib.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,12 @@
-Index: freebsd-utils/lib/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ freebsd-utils/lib/Makefile 2009-11-16 18:35:28.000000000 +0000
+---
+ lib/Makefile | 12 ++++
+ lib/linkaddr.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/linkaddr.h | 32 +++++++++++
+ lib/trimdomain.c | 113 ++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 312 insertions(+)
+
+--- /dev/null
++++ b/lib/Makefile
@@ -0,0 +1,12 @@
+SRCS = linkaddr.c trimdomain.c
+
@@ -15,10 +20,8 @@
+clean:
+ rm -f $(OBJS)
+
-Index: freebsd-utils/lib/linkaddr.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ freebsd-utils/lib/linkaddr.c 2009-11-16 18:17:58.000000000 +0000
+--- /dev/null
++++ b/lib/linkaddr.c
@@ -0,0 +1,155 @@
+/*-
+ * Copyright (c) 1990, 1993
@@ -175,10 +178,8 @@
+ *out = 0;
+ return (obuf);
+}
-Index: freebsd-utils/lib/linkaddr.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ freebsd-utils/lib/linkaddr.h 2009-11-16 18:17:58.000000000 +0000
+--- /dev/null
++++ b/lib/linkaddr.h
@@ -0,0 +1,32 @@
+/*-
+ * Copyright (c) 1990, 1993
@@ -212,10 +213,8 @@
+void link_addr(const char *addr, struct sockaddr_dl *sdl);
+
+char *link_ntoa(const struct sockaddr_dl *sdl);
-Index: freebsd-utils/lib/trimdomain.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ freebsd-utils/lib/trimdomain.c 2009-11-16 18:35:00.000000000 +0000
+--- /dev/null
++++ b/lib/trimdomain.c
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (c) 2001 Brian Somers <brian at Awfulhak.org>
Modified: trunk/freebsd-utils/debian/patches/021_netstat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/021_netstat.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/021_netstat.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,14 @@
-Index: freebsd-utils/usr.bin/netstat/netgraph.c
-===================================================================
---- freebsd-utils.orig/usr.bin/netstat/netgraph.c 2010-04-02 11:07:55.000000000 +0000
-+++ freebsd-utils/usr.bin/netstat/netgraph.c 2010-06-29 07:38:26.000000000 +0000
-@@ -76,8 +76,8 @@
+---
+ usr.bin/netstat/Makefile | 1
+ usr.bin/netstat/main.c | 114 ++++++++++++++++++++++-----------------------
+ usr.bin/netstat/mroute6.c | 1
+ usr.bin/netstat/netgraph.c | 4 -
+ usr.bin/netstat/netstat.h | 13 +++++
+ 5 files changed, 74 insertions(+), 59 deletions(-)
+
+--- a/usr.bin/netstat/netgraph.c
++++ b/usr.bin/netstat/netgraph.c
+@@ -76,8 +76,8 @@ netgraphprotopr(u_long off, const char *
const char *const modname = "ng_socket.ko";
/* XXX We should get "mpath" from "sysctl kern.module_path" */
const char *mpath[] = { "/", "/boot/", "/modules/", NULL };
@@ -13,11 +19,9 @@
const char **pre;
struct kld_file_stat ks;
int fileid;
-Index: freebsd-utils/usr.bin/netstat/mroute6.c
-===================================================================
---- freebsd-utils.orig/usr.bin/netstat/mroute6.c 2008-01-02 23:26:11.000000000 +0000
-+++ freebsd-utils/usr.bin/netstat/mroute6.c 2010-06-29 07:38:26.000000000 +0000
-@@ -89,6 +89,7 @@
+--- a/usr.bin/netstat/mroute6.c
++++ b/usr.bin/netstat/mroute6.c
+@@ -89,6 +89,7 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <stdlib.h>
@@ -25,11 +29,9 @@
#define KERNEL 1
#include <netinet6/ip6_mroute.h>
#undef KERNEL
-Index: freebsd-utils/usr.bin/netstat/main.c
-===================================================================
---- freebsd-utils.orig/usr.bin/netstat/main.c 2010-02-10 00:34:13.000000000 +0000
-+++ freebsd-utils/usr.bin/netstat/main.c 2010-06-29 07:40:12.000000000 +0000
-@@ -75,118 +75,118 @@
+--- a/usr.bin/netstat/main.c
++++ b/usr.bin/netstat/main.c
+@@ -75,118 +75,118 @@ __FBSDID("$FreeBSD$");
static struct nlist nl[] = {
#define N_IFNET 0
@@ -205,10 +207,8 @@
};
struct protox {
-Index: freebsd-utils/usr.bin/netstat/netstat.h
-===================================================================
---- freebsd-utils.orig/usr.bin/netstat/netstat.h 2010-02-10 00:34:13.000000000 +0000
-+++ freebsd-utils/usr.bin/netstat/netstat.h 2010-06-29 07:38:26.000000000 +0000
+--- a/usr.bin/netstat/netstat.h
++++ b/usr.bin/netstat/netstat.h
@@ -35,6 +35,19 @@
*/
@@ -229,11 +229,9 @@
extern int Aflag; /* show addresses of protocol control block */
extern int aflag; /* show all sockets (including servers) */
-Index: freebsd-utils/usr.bin/netstat/Makefile
-===================================================================
---- freebsd-utils.orig/usr.bin/netstat/Makefile 2009-02-15 16:16:38.000000000 +0000
-+++ freebsd-utils/usr.bin/netstat/Makefile 2010-06-29 07:38:26.000000000 +0000
-@@ -22,6 +22,7 @@
+--- a/usr.bin/netstat/Makefile
++++ b/usr.bin/netstat/Makefile
+@@ -22,6 +22,7 @@ BINGRP= kmem
BINMODE=2555
DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
LDADD= -lkvm -lmemstat -lutil
Modified: trunk/freebsd-utils/debian/patches/022_devd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/022_devd.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/022_devd.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,5 +1,11 @@
---- freebsd-utils-8.0.orig/sbin/devd/parse.y (revision 200600)
-+++ freebsd-utils-8.0/sbin/devd/parse.y (working copy)
+---
+ sbin/devd/Makefile | 2 +-
+ sbin/devd/devd.cc | 2 ++
+ sbin/devd/parse.y | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+--- a/sbin/devd/parse.y
++++ b/sbin/devd/parse.y
@@ -29,9 +29,9 @@
* $FreeBSD$
*/
@@ -11,9 +17,9 @@
%}
---- freebsd-utils-8.0.orig/sbin/devd/devd.cc (revision 200600)
-+++ freebsd-utils-8.0/sbin/devd/devd.cc (working copy)
-@@ -55,6 +55,8 @@
+--- a/sbin/devd/devd.cc
++++ b/sbin/devd/devd.cc
+@@ -55,6 +55,8 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include <string.h>
#include <unistd.h>
@@ -22,9 +28,9 @@
#include <algorithm>
#include <map>
---- freebsd-utils-8.0.orig/sbin/devd/Makefile (revision 200600)
-+++ freebsd-utils-8.0/sbin/devd/Makefile (working copy)
-@@ -10,7 +10,7 @@
+--- a/sbin/devd/Makefile
++++ b/sbin/devd/Makefile
+@@ -10,7 +10,7 @@ WARNS= 0
NO_SHARED?=YES
DPADD= ${LIBL} ${LIBUTIL}
@@ -33,5 +39,3 @@
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR}
-
-
Modified: trunk/freebsd-utils/debian/patches/023_acpiconf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/023_acpiconf.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/023_acpiconf.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,5 +1,9 @@
---- freebsd-utils-8.0.orig/usr.sbin/acpi/acpiconf/acpiconf.c (revision 200600)
-+++ freebsd-utils-8.0/usr.sbin/acpi/acpiconfacpiconf.c (working copy)
+---
+ usr.sbin/acpi/acpiconf/acpiconf.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/usr.sbin/acpi/acpiconf/acpiconf.c
++++ b/usr.sbin/acpi/acpiconf/acpiconf.c
@@ -35,10 +35,13 @@
#include <sys/ioctl.h>
#include <sysexits.h>
@@ -12,6 +16,5 @@
#include <contrib/dev/acpica/include/acpi.h>
+#endif
- #define ACPIDEV "/dev/acpi"
+ #define ACPIDEV "/dev/acpi"
-
Modified: trunk/freebsd-utils/debian/patches/024_devfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/024_devfs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/024_devfs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,13 @@
+---
+ sbin/devfs/Makefile | 1 +
+ sbin/devfs/devfs.c | 2 +-
+ sbin/devfs/extern.h | 2 +-
+ sbin/devfs/rule.c | 20 +++++++++++---------
+ 4 files changed, 14 insertions(+), 11 deletions(-)
+
--- a/sbin/devfs/extern.h
+++ b/sbin/devfs/extern.h
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ int eatoi(const char *);
uint16_t eatonum(const char *);
size_t efgetln(FILE *, char **);
void tokenize(const char *, int *, char ***);
@@ -11,7 +18,7 @@
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
-@@ -4,5 +4,6 @@
+@@ -4,5 +4,6 @@ PROG= devfs
SRCS= devfs.c rule.c
MAN= devfs.8
WARNS?= 5
@@ -20,7 +27,7 @@
.include <bsd.prog.mk>
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
-@@ -44,6 +44,8 @@
+@@ -44,6 +44,8 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -29,7 +36,7 @@
#include "extern.h"
-@@ -85,8 +87,8 @@
+@@ -85,8 +87,8 @@ rule_main(int ac, char **av)
int ch;
setprogname("devfs rule");
@@ -40,7 +47,7 @@
switch (ch) {
case 's':
in_rsnum = eatonum(optarg);
-@@ -125,7 +127,7 @@
+@@ -125,7 +127,7 @@ rule_add(int ac, char **av)
}
static int
@@ -49,7 +56,7 @@
{
struct devfs_rule dr;
devfs_rnum rnum;
-@@ -153,7 +155,7 @@
+@@ -153,7 +155,7 @@ rule_apply(int ac __unused, char **av __
}
static int
@@ -58,7 +65,7 @@
{
int rv;
-@@ -166,7 +168,7 @@
+@@ -166,7 +168,7 @@ rule_applyset(int ac, char **av __unused
}
static int
@@ -67,7 +74,7 @@
{
devfs_rid rid;
int rv;
-@@ -181,7 +183,7 @@
+@@ -181,7 +183,7 @@ rule_del(int ac __unused, char **av)
}
static int
@@ -76,7 +83,7 @@
{
struct devfs_rule dr;
int rv;
-@@ -202,7 +204,7 @@
+@@ -202,7 +204,7 @@ rule_delset(int ac, char **av __unused)
}
static int
@@ -85,7 +92,7 @@
{
struct devfs_rule dr;
devfs_rnum rnum;
-@@ -229,7 +231,7 @@
+@@ -229,7 +231,7 @@ rule_show(int ac __unused, char **av)
}
static int
@@ -94,7 +101,7 @@
{
devfs_rsnum rsnum;
-@@ -307,7 +309,7 @@
+@@ -307,7 +309,7 @@ rulespec_instr(struct devfs_rule *dr, co
* Construct a /struct devfs_rule/ from ac and av.
*/
static void
@@ -105,7 +112,7 @@
struct intstr *is;
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ main(int ac, char **av)
int ch;
mountpt = NULL;
Modified: trunk/freebsd-utils/debian/patches/025_camcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/025_camcontrol.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/025_camcontrol.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,11 @@
-Index: freebsd-utils/sbin/camcontrol/camcontrol.c
-===================================================================
---- freebsd-utils.orig/sbin/camcontrol/camcontrol.c 2010-05-08 16:06:54.000000000 +0000
-+++ freebsd-utils/sbin/camcontrol/camcontrol.c 2010-06-29 07:55:38.000000000 +0000
+---
+ sbin/camcontrol/camcontrol.c | 9 ++++-----
+ sbin/camcontrol/modeedit.c | 6 +++---
+ sbin/camcontrol/util.c | 4 ++--
+ 3 files changed, 9 insertions(+), 10 deletions(-)
+
+--- a/sbin/camcontrol/camcontrol.c
++++ b/sbin/camcontrol/camcontrol.c
@@ -30,7 +30,7 @@
__FBSDID("$FreeBSD$");
@@ -11,7 +15,7 @@
#include <sys/types.h>
#include <sys/endian.h>
-@@ -123,9 +123,9 @@
+@@ -123,9 +123,9 @@ struct camcontrol_opts {
};
#ifndef MINIMALISTIC
@@ -24,7 +28,7 @@
#endif
struct camcontrol_opts option_table[] = {
-@@ -4705,7 +4705,6 @@
+@@ -4709,7 +4709,6 @@ main(int argc, char **argv)
* the arguments again.
*/
optind = optstart;
@@ -32,11 +36,9 @@
switch(cmdlist) {
#ifndef MINIMALISTIC
-Index: freebsd-utils/sbin/camcontrol/modeedit.c
-===================================================================
---- freebsd-utils.orig/sbin/camcontrol/modeedit.c 2004-01-22 07:23:36.000000000 +0000
-+++ freebsd-utils/sbin/camcontrol/modeedit.c 2010-06-29 07:55:00.000000000 +0000
-@@ -140,7 +140,7 @@
+--- a/sbin/camcontrol/modeedit.c
++++ b/sbin/camcontrol/modeedit.c
+@@ -140,7 +140,7 @@ static void cleanup_editfile(void);
static void
@@ -45,7 +47,7 @@
char *name)
{
struct editentry *newentry; /* Buffer to hold new entry. */
-@@ -162,7 +162,7 @@
+@@ -162,7 +162,7 @@ editentry_create(void *hook __unused, in
}
static void
@@ -54,7 +56,7 @@
char *name)
{
struct editentry *dest; /* Buffer to hold entry to update. */
-@@ -190,7 +190,7 @@
+@@ -190,7 +190,7 @@ editentry_update(void *hook __unused, in
}
static int
@@ -63,10 +65,8 @@
{
struct editentry *src; /* Entry value to save. */
-Index: freebsd-utils/sbin/camcontrol/util.c
-===================================================================
---- freebsd-utils.orig/sbin/camcontrol/util.c 2003-08-05 09:19:07.000000000 +0000
-+++ freebsd-utils/sbin/camcontrol/util.c 2010-06-29 07:55:00.000000000 +0000
+--- a/sbin/camcontrol/util.c
++++ b/sbin/camcontrol/util.c
@@ -46,7 +46,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -76,7 +76,7 @@
#include <sys/types.h>
#include <stdlib.h>
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ cget(void *hook, char *name)
/* arg_put: "put argument" callback
*/
void
Modified: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,13 @@
+---
+ usr.bin/kdump/Makefile | 5 +-
+ usr.bin/kdump/kdump.c | 46 +++++++++++----------
+ usr.bin/kdump/mksubr | 103 +++++++++++++++++++++++++++++++++----------------
+ usr.bin/kdump/stat16.h | 55 ++++++++++++++++++++++++++
+ 4 files changed, 154 insertions(+), 55 deletions(-)
+
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
-@@ -45,20 +45,18 @@
+@@ -45,20 +45,18 @@ static char sccsid[] = "@(#)kdump.c 8.1
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -24,7 +31,7 @@
#include <sys/un.h>
#ifdef IPX
#include <sys/types.h>
-@@ -71,6 +69,8 @@
+@@ -71,6 +69,8 @@ extern int errno;
#include <netinet/in.h>
#include <ctype.h>
#include <dlfcn.h>
@@ -33,7 +40,7 @@
#include <err.h>
#include <grp.h>
#include <inttypes.h>
-@@ -79,6 +79,7 @@
+@@ -79,6 +79,7 @@ extern int errno;
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -41,7 +48,7 @@
#include <time.h>
#include <unistd.h>
#include <vis.h>
-@@ -97,7 +98,7 @@
+@@ -97,7 +98,7 @@ void ktrpsig(struct ktr_psig *);
void ktrcsw(struct ktr_csw *);
void ktruser(int, unsigned char *);
void ktrsockaddr(struct sockaddr *);
@@ -50,7 +57,7 @@
void ktrstruct(char *, size_t);
void usage(void);
void sockfamilyname(int);
-@@ -111,6 +112,9 @@
+@@ -111,6 +112,9 @@ struct ktr_header ktr_header;
#define TIME_FORMAT "%b %e %T %Y"
#define eqs(s1, s2) (strcmp((s1), (s2)) == 0)
@@ -60,7 +67,7 @@
int
main(int argc, char *argv[])
{
-@@ -650,7 +654,7 @@
+@@ -653,7 +657,7 @@ ktrsyscall(struct ktr_syscall *ktr)
ip++;
narg--;
c = ',';
@@ -69,7 +76,7 @@
print_number(ip,narg,c);
print_number(ip,narg,c);
(void)putchar(',');
-@@ -742,18 +746,18 @@
+@@ -745,18 +749,18 @@ ktrsyscall(struct ktr_syscall *ktr)
ip++;
narg--;
c = ',';
@@ -100,7 +107,7 @@
print_number(ip,narg,c);
(void)putchar(',');
acltypename((int)*ip);
-@@ -1243,7 +1247,7 @@
+@@ -1246,7 +1250,7 @@ ktrsockaddr(struct sockaddr *sa)
}
void
@@ -109,7 +116,7 @@
{
char mode[12], timestr[PATH_MAX + 4];
struct passwd *pwd;
-@@ -1348,7 +1352,7 @@
+@@ -1351,7 +1355,7 @@ ktrstruct(char *buf, size_t buflen)
if (strcmp(name, "stat") == 0) {
if (datalen != sizeof(struct stat))
goto invalid;
@@ -139,7 +146,7 @@
.include <bsd.prog.mk>
--- a/usr.bin/kdump/mksubr
+++ b/usr.bin/kdump/mksubr
-@@ -56,7 +56,9 @@
+@@ -56,7 +56,9 @@ _EOF_
if ($i ~ /define/) \
break; \
++i; \
@@ -150,7 +157,7 @@
cat <<_EOF_
if (or == 0)
(void)printf("<invalid>%ld", (long)arg);
-@@ -135,6 +137,7 @@
+@@ -135,6 +137,7 @@ cat <<_EOF_
#include <sys/fcntl.h>
#include <sys/stat.h>
#include <sys/unistd.h>
@@ -158,7 +165,7 @@
#include <sys/mman.h>
#include <sys/wait.h>
#define _KERNEL
-@@ -148,21 +151,30 @@
+@@ -148,21 +151,30 @@ cat <<_EOF_
#include <sys/reboot.h>
#include <sched.h>
#include <sys/linker.h>
@@ -194,7 +201,7 @@
/*
* These are simple support macros. print_or utilizes a variable
* defined in the calling function to track whether or not it should
-@@ -302,45 +314,72 @@
+@@ -304,45 +316,72 @@ sockoptlevelname (int level, int decimal
}
}
@@ -291,7 +298,7 @@
auto_switch_type "ptraceopname" "PT_[[:alnum:]]+[[:space:]]+[0-9]+" "sys/ptrace.h"
cat <<_EOF_
-@@ -403,7 +442,7 @@
+@@ -405,7 +444,7 @@ rtprioname (int func)
{
switch (func) {
_EOF_
@@ -300,7 +307,7 @@
$include_dir/sys/rtprio.h | grep -v RTP_PRIO | \
awk '{ for (i = 1; i <= NF; i++) \
if ($i ~ /define/) \
-@@ -433,7 +472,7 @@
+@@ -435,7 +474,7 @@ sendrecvflagsname (int flags)
return;
}
_EOF_
@@ -309,7 +316,7 @@
awk '{ for (i = 1; i <= NF; i++) \
if ($i ~ /define/) \
break; \
---- a/usr.bin/kdump/stat16.h
+--- /dev/null
+++ b/usr.bin/kdump/stat16.h
@@ -0,0 +1,55 @@
+/* Copyright (C) 2002, 2006 Free Software Foundation, Inc.
Modified: trunk/freebsd-utils/debian/patches/027_pppctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/027_pppctl.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/027_pppctl.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,11 @@
---- a/usr.sbin/pppctl.orig/Makefile
+---
+ usr.sbin/pppctl/Makefile | 2 +-
+ usr.sbin/pppctl/pppctl.c | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/usr.sbin/pppctl/Makefile
+++ b/usr.sbin/pppctl/Makefile
-@@ -4,6 +4,6 @@
+@@ -4,6 +4,6 @@ PROG= pppctl
MAN= pppctl.8
DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
@@ -8,9 +13,9 @@
+LDADD= -lpthread -ledit -ltermcap -lbsd
.include <bsd.prog.mk>
---- a/usr.sbin/pppctl.orig/pppctl.c
+--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
-@@ -48,6 +48,7 @@
+@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <time.h>
#include <unistd.h>
@@ -18,4 +23,3 @@
#define LINELEN 2048
-Les fichiers binaires usr.sbin/pppctl.orig/pppctl.o et usr.sbin/pppctl/pppctl.o sont différents.
Modified: trunk/freebsd-utils/debian/patches/028_vidcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/028_vidcontrol.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/028_vidcontrol.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,8 @@
+---
+ usr.sbin/vidcontrol/Makefile | 1 +
+ usr.sbin/vidcontrol/vidcontrol.c | 1 +
+ 2 files changed, 2 insertions(+)
+
--- a/usr.sbin/vidcontrol/Makefile
+++ b/usr.sbin/vidcontrol/Makefile
@@ -2,6 +2,7 @@
@@ -10,7 +15,7 @@
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
-@@ -38,6 +38,7 @@
+@@ -38,6 +38,7 @@ static const char rcsid[] =
#include <ctype.h>
#include <err.h>
Modified: trunk/freebsd-utils/debian/patches/029_arp.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/029_arp.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/029_arp.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ usr.sbin/arp/arp.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
-@@ -48,7 +48,7 @@
+@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
* arp - display, set, and delete arp table entries
*/
@@ -9,15 +13,15 @@
#include <sys/param.h>
#include <sys/file.h>
#include <sys/socket.h>
-@@ -65,6 +65,7 @@
+@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#include <netinet/if_ether.h>
+#include <netinet/ether.h>
#include <arpa/inet.h>
-
-@@ -650,8 +706,8 @@
+
+@@ -656,8 +657,8 @@ print_entry(struct sockaddr_dl *sdl,
* Nuke an arp entry
*/
static void
Modified: trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/030_arp_libbsd.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -2,9 +2,13 @@
# To be removed when this functions are available in libbsd
#
+---
+ usr.sbin/arp/arp.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 55 insertions(+)
+
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
-@@ -113,6 +114,61 @@
+@@ -114,6 +114,61 @@ static int flags, doing_proxy, proxy_onl
#define SETFUNC(f) { if (func) usage(); func = (f); }
Modified: trunk/freebsd-utils/debian/patches/031_savecore.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/031_savecore.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/patches/031_savecore.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,8 @@
+---
+ sbin/savecore/Makefile | 1 +
+ sbin/savecore/zopen.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+)
+
--- a/sbin/savecore/Makefile
+++ b/sbin/savecore/Makefile
@@ -1,6 +1,7 @@
@@ -8,7 +13,7 @@
WARNS?= 6
DPADD= ${LIBZ}
LDADD= -lz
---- a/sbin/savecore/zopen.c
+--- /dev/null
+++ b/sbin/savecore/zopen.c
@@ -0,0 +1,42 @@
+/*
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/freebsd-utils/debian/rules 2011-05-26 02:53:11 UTC (rev 3329)
@@ -50,20 +50,15 @@
tar --numeric-owner --owner 0 --group 0 -czf ../freebsd-utils_$(VERSION).orig.tar.gz $(ORIGDIR)
rm -rf $(ORIGDIR)
-patch: patch-stamp
-patch-stamp:
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- touch $@
-
lib: lib-stamp
-lib-stamp: patch-stamp
+lib-stamp:
$(MAKE) -C lib
touch $@
build-arch: freebsd-utils gbde geli kbdcontrol vidcontrol kldutils freebsd-net-tools
freebsd-utils: freebsd-utils-stamp
-freebsd-utils-stamp: patch-stamp
+freebsd-utils-stamp:
# $(PMAKE) -C bin/chflags
$(PMAKE) -C bin/kenv
$(PMAKE) -C sbin/atacontrol
@@ -99,30 +94,30 @@
touch $@
gbde: gbde-stamp
-gbde-stamp: patch-stamp
+gbde-stamp:
# $(PMAKE) -C sbin/gbde
touch $@
geli: geli-stamp
-geli-stamp: patch-stamp
+geli-stamp:
# $(PMAKE) -C sbin/geom/class/eli
touch $@
kbdcontrol: kbdcontrol-stamp
-kbdcontrol-stamp: patch-stamp
+kbdcontrol-stamp:
$(PMAKE) -C usr.sbin/kbdcontrol
sed -i -e "s/^choices=.*/choices=\"`cd share/syscons/keymaps && echo *.kbd | sed -e 's/ /, /g'`\"/g" \
debian/kbdcontrol.config
touch $@
vidcontrol: vidcontrol-stamp
-vidcontrol-stamp: patch-stamp
+vidcontrol-stamp:
$(PMAKE) -C usr.sbin/vidcontrol
$(PMAKE) -C share/syscons/scrnmaps
touch $@
kldutils: kldutils-stamp
-kldutils-stamp: patch-stamp
+kldutils-stamp:
$(PMAKE) -C sbin/kldconfig
$(PMAKE) -C sbin/kldload
$(PMAKE) -C sbin/kldstat
@@ -130,7 +125,7 @@
touch $@
freebsd-net-tools: freebsd-net-tools-stamp
-freebsd-net-tools-stamp: patch-stamp lib-stamp
+freebsd-net-tools-stamp: lib-stamp
$(PMAKE) -C sbin/ifconfig
$(PMAKE) -C sbin/pfctl
$(PMAKE) -C sbin/route
@@ -203,8 +198,6 @@
$(PMAKE) -C usr.sbin/authpf clean
$(PMAKE) -C usr.sbin/pppctl clean
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -rf .pc
rm -f *stamp
dh_clean
Added: trunk/freebsd-utils/debian/source/format
===================================================================
--- trunk/freebsd-utils/debian/source/format (rev 0)
+++ trunk/freebsd-utils/debian/source/format 2011-05-26 02:53:11 UTC (rev 3329)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: trunk/kfreebsd-7/debian/README.source
===================================================================
--- trunk/kfreebsd-7/debian/README.source 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/README.source 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: trunk/kfreebsd-7/debian/changelog
===================================================================
--- trunk/kfreebsd-7/debian/changelog 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/changelog 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,11 @@
kfreebsd-7 (7.3-8) UNRELEASED; urgency=low
* Now using Standards-Version 3.9.2 (no changes needed).
+ * Switch to source format “3.0 (quilt)”.
+ - Remove quilt from Build-Depends.
+ - Remove patch target in debian/rules.
+ - Remove now unneeded README.source.
+ - Refresh all patches.
-- Guillem Jover <guillem at debian.org> Wed, 25 May 2011 09:57:33 +0200
Modified: trunk/kfreebsd-7/debian/control.in
===================================================================
--- trunk/kfreebsd-7/debian/control.in 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/control.in 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,7 +5,7 @@
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
-Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, sharutils, flex-old | flex,
+Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
freebsd-buildutils (>= 7) [kfreebsd-any], gcc-4.3 [kfreebsd-any], libdb-dev,
libbsd-dev [kfreebsd-any], libsbuf-dev [kfreebsd-any]
Standards-Version: 3.9.2
Modified: trunk/kfreebsd-7/debian/patches/000_mbuf.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_mbuf.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/000_mbuf.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/kern/uipc_mbuf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
-@@ -302,6 +302,7 @@
+@@ -301,6 +301,7 @@ mb_dupcl(struct mbuf *n, struct mbuf *m)
n->m_ext.ref_cnt = m->m_ext.ref_cnt;
n->m_ext.ext_type = m->m_ext.ext_type;
n->m_flags |= M_EXT;
Modified: trunk/kfreebsd-7/debian/patches/000_nfsclient.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/000_nfsclient.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/000_nfsclient.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,11 @@
+---
+ sys/nfsclient/nfs_vfsops.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
-@@ -1074,6 +1074,11 @@
- error = EINVAL;
+@@ -1002,6 +1002,11 @@ nfs_mount(struct mount *mp, struct threa
+ nfs_decode_args(mp, nmp, &args, NULL);
goto out;
}
+ if (args.fhsize < 0 || args.fhsize > NFSX_V3FHMAX) {
@@ -10,5 +14,5 @@
+ goto out;
+ }
- if (mp->mnt_flag & MNT_UPDATE) {
- struct nfsmount *nmp = VFSTONFS(mp);
+ /*
+ * Make the nfs_ip_paranoia sysctl serve as the default connection
Modified: trunk/kfreebsd-7/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/001_misc.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/001_misc.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -2,12 +2,15 @@
Status: chflags is BSD-specific. We could add it to freebsd-utils.
The rest has been rejected (kern/93502)
-Index: src/sys/conf/kern.mk
-===================================================================
---- src.orig/sys/conf/kern.mk
-+++ src/sys/conf/kern.mk
+---
+ sys/conf/kern.mk | 18 +++++++++++++++---
+ sys/conf/kern.post.mk | 2 --
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
@@ -1,5 +1,9 @@
- # $FreeBSD: src/sys/conf/kern.mk,v 1.52.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $
+ # $FreeBSD$
+.if !defined(OPSYS)
+OPSYS!= uname -s
@@ -33,7 +36,7 @@
.if !defined(WITH_GCC3)
_Wno_pointer_sign=-Wno-pointer-sign
.endif
-@@ -36,8 +44,12 @@
+@@ -36,8 +44,12 @@ _wundef= -Wundef
# reserved for user applications.
#
.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
@@ -47,11 +50,9 @@
INLINE_LIMIT?= 8000
.endif
-Index: src/sys/conf/kern.post.mk
-===================================================================
---- src.orig/sys/conf/kern.post.mk
-+++ src/sys/conf/kern.post.mk
-@@ -211,11 +221,9 @@
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -211,11 +211,9 @@ kernel-install:
.if exists(${DESTDIR}${KODIR})
-thiskernel=`sysctl -n kern.bootfile` ; \
if [ ! "`dirname "$$thiskernel"`" -ef ${DESTDIR}${KODIR} ] ; then \
Modified: trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/003_glibc_dev_aicasm.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,17 @@
-Index: src/sys/dev/aic7xxx/aicasm/Makefile
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/Makefile
-+++ src/sys/dev/aic7xxx/aicasm/Makefile
-@@ -14,7 +14,7 @@
+---
+ sys/dev/aic7xxx/aicasm/Makefile | 9 +--------
+ sys/dev/aic7xxx/aicasm/aicasm.h | 5 +++--
+ sys/dev/aic7xxx/aicasm/aicasm_gram.y | 5 +++--
+ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y | 5 +++--
+ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l | 6 ++++--
+ sys/dev/aic7xxx/aicasm/aicasm_scan.l | 6 ++++--
+ sys/dev/aic7xxx/aicasm/aicasm_symbol.c | 7 ++++---
+ sys/dev/aic7xxx/aicasm/aicasm_symbol.h | 5 +++--
+ 8 files changed, 25 insertions(+), 23 deletions(-)
+
+--- a/sys/dev/aic7xxx/aicasm/Makefile
++++ b/sys/dev/aic7xxx/aicasm/Makefile
+@@ -14,7 +14,7 @@ GENHDRS= aicasm_gram.h aicasm_macro_gram
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
DPADD= ${LIBL}
@@ -11,7 +20,7 @@
# Correct path for kernel builds
# Don't rely on the kernel's .depend file
-@@ -23,13 +23,6 @@
+@@ -23,13 +23,6 @@ LDADD= -ll
DEPENDFILE= .depend_aicasm
.endif
@@ -25,12 +34,10 @@
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
.endif
-Index: src/sys/dev/aic7xxx/aicasm/aicasm.h
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm.h
-+++ src/sys/dev/aic7xxx/aicasm/aicasm.h
+--- a/sys/dev/aic7xxx/aicasm/aicasm.h
++++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -42,8 +42,9 @@
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.17.20.1 2009/04/15 03:14:26 kensmith Exp $
+ * $FreeBSD$
*/
-#ifdef __linux__
@@ -41,10 +48,8 @@
#else
#include <sys/queue.h>
#endif
-Index: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_gram.y
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_gram.y
+--- a/sys/dev/aic7xxx/aicasm/aicasm_gram.y
++++ b/sys/dev/aic7xxx/aicasm/aicasm_gram.y
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -57,10 +62,8 @@
#else
#include <sys/queue.h>
#endif
-Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
+--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
++++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y
@@ -52,8 +52,9 @@
#include <string.h>
#include <sysexits.h>
@@ -73,10 +76,8 @@
#else
#include <sys/queue.h>
#endif
-Index: src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
+--- a/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
++++ b/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -90,10 +91,8 @@
#else
#include <sys/queue.h>
#endif
-Index: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
++++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -51,8 +51,10 @@
#include <stdio.h>
#include <string.h>
@@ -107,10 +106,8 @@
#else
#include <sys/queue.h>
#endif
-Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
+--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
++++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.c
@@ -44,10 +44,11 @@
#include <sys/types.h>
@@ -126,12 +123,10 @@
#endif
#include <fcntl.h>
#include <inttypes.h>
-Index: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
-===================================================================
---- src.orig/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
-+++ src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
++++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -42,8 +42,9 @@
- * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h,v 1.17.20.1 2009/04/15 03:14:26 kensmith Exp $
+ * $FreeBSD$
*/
-#ifdef __linux__
Modified: trunk/kfreebsd-7/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/004_xargs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/004_xargs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,11 +1,14 @@
Status: xargs -J option requested to both upstream and debian.
-Index: src/sys/conf/kmod.mk
-===================================================================
---- src.orig/sys/conf/kmod.mk
-+++ src/sys/conf/kmod.mk
-@@ -204,7 +204,7 @@
+---
+ sys/conf/kmod.mk | 2 +-
+ sys/contrib/dev/acpica/acpica_prep.sh | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -204,7 +204,7 @@ ${FULLPROG}: ${OBJS}
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -14,11 +17,9 @@
.endif
.endif
.if !defined(DEBUG_FLAGS) && ${MACHINE_ARCH} == amd64
-Index: src/sys/contrib/dev/acpica/acpica_prep.sh
-===================================================================
---- src.orig/sys/contrib/dev/acpica/acpica_prep.sh
-+++ src/sys/contrib/dev/acpica/acpica_prep.sh
-@@ -55,12 +55,12 @@
+--- a/sys/contrib/dev/acpica/acpica_prep.sh
++++ b/sys/contrib/dev/acpica/acpica_prep.sh
+@@ -55,12 +55,12 @@ done
echo copying full dirs
for i in ${fulldirs}; do
Modified: trunk/kfreebsd-7/debian/patches/005_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/005_binutils.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/005_binutils.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,11 +1,23 @@
Status: Reported as kern/93331
-Index: src/sys/i386/i386/locore.s
-===================================================================
---- src.orig/sys/i386/i386/locore.s
-+++ src/sys/i386/i386/locore.s
-@@ -338,7 +338,7 @@
+---
+ sys/amd64/amd64/cpu_switch.S | 16 ++++++++--------
+ sys/amd64/ia32/ia32_signal.c | 8 ++++----
+ sys/amd64/ia32/ia32_sigtramp.S | 8 ++++----
+ sys/amd64/include/cpufunc.h | 18 +++++++++---------
+ sys/amd64/linux32/linux32_locore.s | 8 ++++----
+ sys/amd64/linux32/linux32_sysvec.c | 8 ++++----
+ sys/compat/ndis/winx32_wrap.S | 2 +-
+ sys/i386/i386/locore.s | 6 +++---
+ sys/i386/i386/swtch.s | 6 +++---
+ sys/i386/include/cpufunc.h | 8 ++++----
+ sys/i386/linux/linux_locore.s | 4 ++--
+ 11 files changed, 46 insertions(+), 46 deletions(-)
+
+--- a/sys/i386/i386/locore.s
++++ b/sys/i386/i386/locore.s
+@@ -336,7 +336,7 @@ NON_GPROF_ENTRY(sigcode)
pushl %eax
testl $PSL_VM,UC_EFLAGS(%eax)
jne 1f
@@ -14,7 +26,7 @@
1:
movl $SYS_sigreturn,%eax
pushl %eax /* junk to fake return addr. */
-@@ -355,7 +355,7 @@
+@@ -353,7 +353,7 @@ freebsd4_sigcode:
pushl %eax
testl $PSL_VM,UC4_EFLAGS(%eax)
jne 1f
@@ -23,7 +35,7 @@
1:
movl $344,%eax /* 4.x SYS_sigreturn */
pushl %eax /* junk to fake return addr. */
-@@ -373,7 +373,7 @@
+@@ -371,7 +371,7 @@ osigcode:
pushl %eax
testl $PSL_VM,SC_PS(%eax)
jne 9f
@@ -32,11 +44,9 @@
9:
movl $103,%eax /* 3.x SYS_sigreturn */
pushl %eax /* junk to fake return addr. */
-Index: src/sys/i386/i386/swtch.s
-===================================================================
---- src.orig/sys/i386/i386/swtch.s
-+++ src/sys/i386/i386/swtch.s
-@@ -130,7 +130,7 @@
+--- a/sys/i386/i386/swtch.s
++++ b/sys/i386/i386/swtch.s
+@@ -130,7 +130,7 @@ ENTRY(cpu_switch)
movl %ebp,PCB_EBP(%edx)
movl %esi,PCB_ESI(%edx)
movl %edi,PCB_EDI(%edx)
@@ -45,7 +55,7 @@
pushfl /* PSL */
popl PCB_PSL(%edx)
/* Test if debug registers should be saved. */
-@@ -301,7 +301,7 @@
+@@ -301,7 +301,7 @@ sw1:
/* This must be done after loading the user LDT. */
.globl cpu_switch_load_gs
cpu_switch_load_gs:
@@ -54,7 +64,7 @@
/* Test if debug registers should be restored. */
testl $PCB_DBREGS,PCB_FLAGS(%edx)
-@@ -371,7 +371,7 @@
+@@ -371,7 +371,7 @@ ENTRY(savectx)
movl %ebp,PCB_EBP(%ecx)
movl %esi,PCB_ESI(%ecx)
movl %edi,PCB_EDI(%ecx)
@@ -63,11 +73,9 @@
pushfl
popl PCB_PSL(%ecx)
-Index: src/sys/i386/include/cpufunc.h
-===================================================================
---- src.orig/sys/i386/include/cpufunc.h
-+++ src/sys/i386/include/cpufunc.h
-@@ -452,7 +452,7 @@
+--- a/sys/i386/include/cpufunc.h
++++ b/sys/i386/include/cpufunc.h
+@@ -466,7 +466,7 @@ static __inline u_int
rfs(void)
{
u_int sel;
@@ -76,7 +84,7 @@
return (sel);
}
-@@ -468,7 +468,7 @@
+@@ -482,7 +482,7 @@ static __inline u_int
rgs(void)
{
u_int sel;
@@ -85,7 +93,7 @@
return (sel);
}
-@@ -507,13 +507,13 @@
+@@ -521,13 +521,13 @@ rtr(void)
static __inline void
load_fs(u_int sel)
{
@@ -101,10 +109,8 @@
}
static __inline void
-Index: src/sys/i386/linux/linux_locore.s
-===================================================================
---- src.orig/sys/i386/linux/linux_locore.s
-+++ src/sys/i386/linux/linux_locore.s
+--- a/sys/i386/linux/linux_locore.s
++++ b/sys/i386/linux/linux_locore.s
@@ -8,7 +8,7 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
@@ -114,7 +120,7 @@
movl %esp, %ebx /* pass sigframe */
push %eax /* fake ret addr */
movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
-@@ -20,7 +20,7 @@
+@@ -20,7 +20,7 @@ linux_rt_sigcode:
call *LINUX_RT_SIGF_HANDLER(%esp)
leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */
@@ -123,11 +129,9 @@
push %eax /* fake ret addr */
movl $LINUX_SYS_linux_rt_sigreturn,%eax /* linux_rt_sigreturn() */
int $0x80 /* enter kernel with args */
-Index: src/sys/compat/ndis/winx32_wrap.S
-===================================================================
---- src.orig/sys/compat/ndis/winx32_wrap.S
-+++ src/sys/compat/ndis/winx32_wrap.S
-@@ -369,7 +369,7 @@
+--- a/sys/compat/ndis/winx32_wrap.S
++++ b/sys/compat/ndis/winx32_wrap.S
+@@ -369,7 +369,7 @@ ENTRY(x86_getfs)
ret
ENTRY(x86_setfs)
@@ -136,11 +140,9 @@
ret
ENTRY(x86_gettid)
-Index: src/sys/amd64/amd64/cpu_switch.S
-===================================================================
---- src.orig/sys/amd64/amd64/cpu_switch.S
-+++ src/sys/amd64/amd64/cpu_switch.S
-@@ -260,12 +260,12 @@
+--- a/sys/amd64/amd64/cpu_switch.S
++++ b/sys/amd64/amd64/cpu_switch.S
+@@ -260,12 +260,12 @@ do_kthread:
jmp do_tss
store_seg:
@@ -157,7 +159,7 @@
jmp done_store_seg
2: movq PCPU(GS32P),%rax
movq (%rax),%rax
-@@ -277,11 +277,11 @@
+@@ -277,11 +277,11 @@ load_seg:
jnz 2f
1: movl $MSR_GSBASE,%ecx
rdmsr
@@ -173,11 +175,9 @@
jmp restore_fsbase
/* Restore userland %gs while preserving kernel gsbase */
2: movq PCPU(GS32P),%rax
-Index: src/sys/amd64/ia32/ia32_signal.c
-===================================================================
---- src.orig/sys/amd64/ia32/ia32_signal.c
-+++ src/sys/amd64/ia32/ia32_signal.c
-@@ -328,8 +328,8 @@
+--- a/sys/amd64/ia32/ia32_signal.c
++++ b/sys/amd64/ia32/ia32_signal.c
+@@ -328,8 +328,8 @@ freebsd4_ia32_sendsig(sig_t catcher, ksi
sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
sf.sf_uc.uc_mcontext.mc_gs = rgs();
sf.sf_uc.uc_mcontext.mc_fs = rfs();
@@ -188,7 +188,7 @@
sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
-@@ -443,8 +443,8 @@
+@@ -443,8 +443,8 @@ ia32_sendsig(sig_t catcher, ksiginfo_t *
sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0;
sf.sf_uc.uc_mcontext.mc_gs = rgs();
sf.sf_uc.uc_mcontext.mc_fs = rfs();
@@ -199,11 +199,9 @@
sf.sf_uc.uc_mcontext.mc_edi = regs->tf_rdi;
sf.sf_uc.uc_mcontext.mc_esi = regs->tf_rsi;
sf.sf_uc.uc_mcontext.mc_ebp = regs->tf_rbp;
-Index: src/sys/amd64/include/cpufunc.h
-===================================================================
---- src.orig/sys/amd64/include/cpufunc.h
-+++ src/sys/amd64/include/cpufunc.h
-@@ -482,7 +482,7 @@
+--- a/sys/amd64/include/cpufunc.h
++++ b/sys/amd64/include/cpufunc.h
+@@ -496,7 +496,7 @@ static __inline u_int
rfs(void)
{
u_int sel;
@@ -212,7 +210,7 @@
return (sel);
}
-@@ -490,7 +490,7 @@
+@@ -504,7 +504,7 @@ static __inline u_int
rgs(void)
{
u_int sel;
@@ -221,7 +219,7 @@
return (sel);
}
-@@ -498,20 +498,20 @@
+@@ -512,20 +512,20 @@ static __inline u_int
rss(void)
{
u_int sel;
@@ -245,7 +243,7 @@
}
#ifdef _KERNEL
-@@ -526,7 +526,7 @@
+@@ -540,7 +540,7 @@ load_fs(u_int sel)
/* Preserve the fsbase value across the selector load */
fsbase = MSR_FSBASE;
@@ -254,7 +252,7 @@
: : "rm" (sel), "c" (fsbase) : "eax", "edx");
}
-@@ -544,7 +544,7 @@
+@@ -558,7 +558,7 @@ load_gs(u_int sel)
* being trashed happens to be the kernel gsbase at the time.
*/
gsbase = MSR_GSBASE;
@@ -263,7 +261,7 @@
: : "rm" (sel), "c" (gsbase) : "eax", "edx");
}
#else
-@@ -552,13 +552,13 @@
+@@ -566,13 +566,13 @@ load_gs(u_int sel)
static __inline void
load_fs(u_int sel)
{
@@ -279,11 +277,9 @@
}
#endif
-Index: src/sys/amd64/linux32/linux32_sysvec.c
-===================================================================
---- src.orig/sys/amd64/linux32/linux32_sysvec.c
-+++ src/sys/amd64/linux32/linux32_sysvec.c
-@@ -365,9 +365,9 @@
+--- a/sys/amd64/linux32/linux32_sysvec.c
++++ b/sys/amd64/linux32/linux32_sysvec.c
+@@ -374,9 +374,9 @@ linux_rt_sendsig(sig_t catcher, ksiginfo
frame.sf_sc.uc_mcontext.sc_mask = frame.sf_sc.uc_sigmask.__bits[0];
frame.sf_sc.uc_mcontext.sc_gs = rgs();
frame.sf_sc.uc_mcontext.sc_fs = rfs();
@@ -295,7 +291,7 @@
"=rm" (frame.sf_sc.uc_mcontext.sc_ds));
frame.sf_sc.uc_mcontext.sc_edi = regs->tf_rdi;
frame.sf_sc.uc_mcontext.sc_esi = regs->tf_rsi;
-@@ -499,8 +499,8 @@
+@@ -508,8 +508,8 @@ linux_sendsig(sig_t catcher, ksiginfo_t
frame.sf_sc.sc_mask = lmask.__bits[0];
frame.sf_sc.sc_gs = rgs();
frame.sf_sc.sc_fs = rfs();
@@ -306,11 +302,9 @@
frame.sf_sc.sc_edi = regs->tf_rdi;
frame.sf_sc.sc_esi = regs->tf_rsi;
frame.sf_sc.sc_ebp = regs->tf_rbp;
-Index: src/sys/amd64/ia32/ia32_sigtramp.S
-===================================================================
---- src.orig/sys/amd64/ia32/ia32_sigtramp.S
-+++ src/sys/amd64/ia32/ia32_sigtramp.S
-@@ -45,8 +45,8 @@
+--- a/sys/amd64/ia32/ia32_sigtramp.S
++++ b/sys/amd64/ia32/ia32_sigtramp.S
+@@ -45,8 +45,8 @@ ia32_sigcode:
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC(%esp),%eax /* get ucontext */
pushl %eax
@@ -321,7 +315,7 @@
movl $SYS_sigreturn,%eax
pushl %eax /* junk to fake return addr. */
int $0x80 /* enter kernel with args */
-@@ -60,8 +60,8 @@
+@@ -60,8 +60,8 @@ freebsd4_ia32_sigcode:
calll *IA32_SIGF_HANDLER(%esp)
leal IA32_SIGF_UC4(%esp),%eax/* get ucontext */
pushl %eax
@@ -332,10 +326,8 @@
movl $344,%eax /* 4.x SYS_sigreturn */
pushl %eax /* junk to fake return addr. */
int $0x80 /* enter kernel with args */
-Index: src/sys/amd64/linux32/linux32_locore.s
-===================================================================
---- src.orig/sys/amd64/linux32/linux32_locore.s
-+++ src/sys/amd64/linux32/linux32_locore.s
+--- a/sys/amd64/linux32/linux32_locore.s
++++ b/sys/amd64/linux32/linux32_locore.s
@@ -11,8 +11,8 @@
NON_GPROF_ENTRY(linux_sigcode)
call *LINUX_SIGF_HANDLER(%esp)
@@ -347,7 +339,7 @@
movl %esp, %ebx /* pass sigframe */
push %eax /* fake ret addr */
movl $LINUX_SYS_linux_sigreturn,%eax /* linux_sigreturn() */
-@@ -24,8 +24,8 @@
+@@ -24,8 +24,8 @@ linux_rt_sigcode:
call *LINUX_RT_SIGF_HANDLER(%esp)
leal LINUX_RT_SIGF_UC(%esp),%ebx /* linux ucp */
leal LINUX_RT_SIGF_SC(%ebx),%ecx /* linux sigcontext */
Modified: trunk/kfreebsd-7/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/007_clone_signals.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,11 @@
-Index: src/sys/kern/kern_fork.c
-===================================================================
---- src.orig/sys/kern/kern_fork.c
-+++ src/sys/kern/kern_fork.c
-@@ -529,7 +529,13 @@
+---
+ sys/kern/kern_fork.c | 8 +++++++-
+ sys/sys/unistd.h | 4 ++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+--- a/sys/kern/kern_fork.c
++++ b/sys/kern/kern_fork.c
+@@ -530,7 +530,13 @@ again:
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
@@ -17,10 +20,8 @@
else
p2->p_sigparent = SIGCHLD;
-Index: src/sys/sys/unistd.h
-===================================================================
---- src.orig/sys/sys/unistd.h
-+++ src/sys/sys/unistd.h
+--- a/sys/sys/unistd.h
++++ b/sys/sys/unistd.h
@@ -181,6 +181,10 @@
#define RFHIGHPID (1<<18) /* use a pid higher then 10 (idleproc) */
#define RFPPWAIT (1<<31) /* parent sleeps until child exits (vfork) */
Modified: trunk/kfreebsd-7/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/008_config.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/008_config.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -3,11 +3,14 @@
Status: gotta uncomment WARNS (see #351366), and find a portable way to add
"-lbsd". after this it can be sent upstream.
-Index: src/usr.sbin/config/Makefile
-===================================================================
---- src.orig/usr.sbin/config/Makefile
-+++ src/usr.sbin/config/Makefile
-@@ -9,11 +9,11 @@
+---
+ usr.sbin/config/Makefile | 6 +++---
+ usr.sbin/config/main.c | 11 ++++++++++-
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+--- a/usr.sbin/config/Makefile
++++ b/usr.sbin/config/Makefile
+@@ -9,11 +9,11 @@ SRCS= config.y main.c lang.l mkmakefile.
kernconf.c: kernconf.tmpl
file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
@@ -22,12 +25,10 @@
CLEANFILES+= kernconf.c
-Index: src/usr.sbin/config/main.c
-===================================================================
---- src.orig/usr.sbin/config/main.c
-+++ src/usr.sbin/config/main.c
-@@ -41,12 +41,17 @@
- "$FreeBSD: src/usr.sbin/config/main.c,v 1.76.2.1.4.1 2009/04/15 03:14:26 kensmith Exp $";
+--- a/usr.sbin/config/main.c
++++ b/usr.sbin/config/main.c
+@@ -41,12 +41,17 @@ static const char rcsid[] =
+ "$FreeBSD$";
#endif /* not lint */
+#include <stdarg.h>
@@ -45,7 +46,7 @@
#include <assert.h>
#include <ctype.h>
-@@ -606,7 +612,11 @@
+@@ -606,7 +611,11 @@ cleanheaders(char *p)
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
Modified: trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/009_disable_duped_modules.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,11 +1,20 @@
Status: in upstream BTS
-Index: src/sys/conf/Makefile.amd64
-===================================================================
---- src.orig/sys/conf/Makefile.amd64
-+++ src/sys/conf/Makefile.amd64
-@@ -39,6 +39,8 @@
+---
+ sys/conf/Makefile.amd64 | 2 ++
+ sys/conf/Makefile.arm | 2 ++
+ sys/conf/Makefile.i386 | 2 ++
+ sys/conf/Makefile.ia64 | 2 ++
+ sys/conf/Makefile.pc98 | 2 ++
+ sys/conf/Makefile.powerpc | 2 ++
+ sys/conf/Makefile.sparc64 | 2 ++
+ usr.sbin/config/mkmakefile.c | 25 +++++++++++++++++++++++++
+ 8 files changed, 39 insertions(+)
+
+--- a/sys/conf/Makefile.amd64
++++ b/sys/conf/Makefile.amd64
+@@ -40,6 +40,8 @@ CFLAGS+= -fno-omit-frame-pointer
MKMODULESENV+= MACHINE=amd64
@@ -14,11 +23,9 @@
%BEFORE_DEPEND
%OBJS
-Index: src/sys/conf/Makefile.arm
-===================================================================
---- src.orig/sys/conf/Makefile.arm
-+++ src/sys/conf/Makefile.arm
-@@ -108,6 +108,8 @@
+--- a/sys/conf/Makefile.arm
++++ b/sys/conf/Makefile.arm
+@@ -108,6 +108,8 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$
MKMODULESENV+= MACHINE=${MACHINE}
@@ -27,11 +34,9 @@
%BEFORE_DEPEND
%OBJS
-Index: src/sys/conf/Makefile.i386
-===================================================================
---- src.orig/sys/conf/Makefile.i386
-+++ src/sys/conf/Makefile.i386
-@@ -34,6 +34,8 @@
+--- a/sys/conf/Makefile.i386
++++ b/sys/conf/Makefile.i386
+@@ -40,6 +40,8 @@ MACHINE=i386
MKMODULESENV+= MACHINE=${MACHINE}
@@ -40,11 +45,9 @@
%BEFORE_DEPEND
%OBJS
-Index: src/sys/conf/Makefile.ia64
-===================================================================
---- src.orig/sys/conf/Makefile.ia64
-+++ src/sys/conf/Makefile.ia64
-@@ -36,6 +36,8 @@
+--- a/sys/conf/Makefile.ia64
++++ b/sys/conf/Makefile.ia64
+@@ -36,6 +36,8 @@ CFLAGS+= -mconstant-gp
ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -53,11 +56,9 @@
%BEFORE_DEPEND
%OBJS
-Index: src/sys/conf/Makefile.pc98
-===================================================================
---- src.orig/sys/conf/Makefile.pc98
-+++ src/sys/conf/Makefile.pc98
-@@ -34,6 +34,8 @@
+--- a/sys/conf/Makefile.pc98
++++ b/sys/conf/Makefile.pc98
+@@ -34,6 +34,8 @@ MACHINE=pc98
MKMODULESENV+= MACHINE=${MACHINE}
@@ -66,11 +67,9 @@
%BEFORE_DEPEND
%OBJS
-Index: src/sys/conf/Makefile.powerpc
-===================================================================
---- src.orig/sys/conf/Makefile.powerpc
-+++ src/sys/conf/Makefile.powerpc
-@@ -37,6 +37,8 @@
+--- a/sys/conf/Makefile.powerpc
++++ b/sys/conf/Makefile.powerpc
+@@ -37,6 +37,8 @@ DDB_ENABLED!= grep DDB opt_ddb.h || true
CFLAGS+= -fno-omit-frame-pointer
.endif
@@ -79,11 +78,9 @@
%BEFORE_DEPEND
%OBJS
-Index: src/sys/conf/Makefile.sparc64
-===================================================================
---- src.orig/sys/conf/Makefile.sparc64
-+++ src/sys/conf/Makefile.sparc64
-@@ -32,6 +32,8 @@
+--- a/sys/conf/Makefile.sparc64
++++ b/sys/conf/Makefile.sparc64
+@@ -32,6 +32,8 @@ S= ../../..
MDOBJS= exception.o interrupt.o
@@ -92,11 +89,9 @@
%BEFORE_DEPEND
%OBJS
-Index: src/usr.sbin/config/mkmakefile.c
-===================================================================
---- src.orig/usr.sbin/config/mkmakefile.c
-+++ src/usr.sbin/config/mkmakefile.c
-@@ -70,6 +70,7 @@
+--- a/usr.sbin/config/mkmakefile.c
++++ b/usr.sbin/config/mkmakefile.c
+@@ -70,6 +70,7 @@ static void do_clean(FILE *);
static void do_rules(FILE *);
static void do_xxfiles(char *, FILE *);
static void do_objs(FILE *);
@@ -104,7 +99,7 @@
static void do_before_depend(FILE *);
static int opteq(const char *, const char *);
static void read_files(void);
-@@ -146,6 +147,8 @@
+@@ -146,6 +147,8 @@ makefile(void)
}
if (eq(line, "%BEFORE_DEPEND\n"))
do_before_depend(ofp);
@@ -113,7 +108,7 @@
else if (eq(line, "%OBJS\n"))
do_objs(ofp);
else if (strncmp(line, "%FILES.", 7) == 0)
-@@ -626,6 +629,28 @@
+@@ -626,6 +629,28 @@ do_objs(FILE *fp)
}
static void
Modified: trunk/kfreebsd-7/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/013_ip_packed.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,10 @@
-Index: src/sys/netinet/ip.h
-===================================================================
---- src.orig/sys/netinet/ip.h
-+++ src/sys/netinet/ip.h
-@@ -67,7 +67,7 @@
+---
+ sys/netinet/ip.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sys/netinet/ip.h
++++ b/sys/netinet/ip.h
+@@ -67,7 +67,7 @@ struct ip {
u_char ip_p; /* protocol */
u_short ip_sum; /* checksum */
struct in_addr ip_src,ip_dst; /* source and dest address */
Modified: trunk/kfreebsd-7/debian/patches/017_oss_compat.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/017_oss_compat.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/017_oss_compat.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,10 @@
-Index: src/sys/sys/soundcard.h
-===================================================================
---- src.orig/sys/sys/soundcard.h
-+++ src/sys/sys/soundcard.h
-@@ -813,6 +813,8 @@
+---
+ sys/sys/soundcard.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sys/sys/soundcard.h
++++ b/sys/sys/soundcard.h
+@@ -813,6 +813,8 @@ typedef struct audio_buf_info {
/* Has a coprocessor, sometimes it's a DSP but usually not */
#define DSP_CAP_TRIGGER 0x00001000 /* Supports SETTRIGGER */
#define DSP_CAP_MMAP 0x00002000 /* Supports mmap() */
Modified: trunk/kfreebsd-7/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/020_linker.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/020_linker.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,11 +4,14 @@
for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
-Index: src/sys/conf/kern.post.mk
-===================================================================
---- src.orig/sys/conf/kern.post.mk
-+++ src/sys/conf/kern.post.mk
-@@ -85,7 +85,9 @@
+---
+ sys/conf/kern.post.mk | 4 +++-
+ sys/conf/kmod.mk | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -85,7 +85,9 @@ gdbinit:
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@echo linking ${.TARGET}
@@ -19,11 +22,9 @@
.if defined(CTFMERGE)
${SYSTEM_CTFMERGE}
.endif
-Index: src/sys/conf/kmod.mk
-===================================================================
---- src.orig/sys/conf/kmod.mk
-+++ src/sys/conf/kmod.mk
-@@ -177,7 +177,9 @@
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -177,7 +177,9 @@ ${PROG}.symbols: ${FULLPROG}
.if ${MACHINE_ARCH} != amd64
${FULLPROG}: ${KMOD}.kld
Modified: trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/102_POLL_HUP.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -6,11 +6,13 @@
http://www.freebsd.org/cgi/query-pr.cgi?pr=126076
-Index: src/sys/sys/signal.h
-===================================================================
---- src.orig/sys/sys/signal.h
-+++ src/sys/sys/signal.h
-@@ -284,7 +284,7 @@
+---
+ sys/sys/signal.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sys/sys/signal.h
++++ b/sys/sys/signal.h
+@@ -284,7 +284,7 @@ typedef struct __siginfo {
#define POLL_MSG 3 /* Input message available */
#define POLL_ERR 4 /* I/O Error */
#define POLL_PRI 5 /* High priority input available */
Modified: trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/103_stat_pipe.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
---- src.orig/sys/kern/sys_pipe.c
-+++ src/sys/kern/sys_pipe.c
-@@ -1384,6 +1384,8 @@
+---
+ sys/kern/sys_pipe.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sys/kern/sys_pipe.c
++++ b/sys/kern/sys_pipe.c
+@@ -1384,6 +1384,8 @@ pipe_stat(fp, ub, active_cred, td)
struct thread *td;
{
struct pipe *pipe = fp->f_data;
@@ -9,7 +13,7 @@
#ifdef MAC
int error;
-@@ -1410,6 +1412,8 @@
+@@ -1410,6 +1412,8 @@ pipe_stat(fp, ub, active_cred, td)
* Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
* XXX (st_dev, st_ino) should be unique.
*/
Modified: trunk/kfreebsd-7/debian/patches/104_linprocfs.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/104_linprocfs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/104_linprocfs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,9 +5,13 @@
Submitted as
http://www.freebsd.org/cgi/query-pr.cgi?pr=144584
+---
+ sys/compat/linprocfs/linprocfs.c | 66 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 53 insertions(+), 13 deletions(-)
+
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -110,13 +110,36 @@
+@@ -104,13 +104,36 @@ __FBSDID("$FreeBSD$");
/*
* Various conversion macros
*/
@@ -44,7 +48,7 @@
/**
* @brief Mapping of ki_stat in struct kinfo_proc to the linux state
*
-@@ -502,12 +525,24 @@
+@@ -430,12 +453,24 @@ linprocfs_douptime(PFS_FILL_ARGS)
{
long cp_time[CPUSTATES];
struct timeval tv;
@@ -70,7 +74,7 @@
return (0);
}
-@@ -613,9 +648,17 @@
+@@ -541,9 +576,17 @@ linprocfs_doprocstat(PFS_FILL_ARGS)
struct kinfo_proc kp;
char state;
static int ratelimit = 0;
@@ -88,7 +92,7 @@
sbuf_printf(sb, "%d", p->p_pid);
#define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg)
PS_ADD("comm", "(%s)", p->p_comm);
-@@ -634,30 +677,27 @@
+@@ -562,30 +605,27 @@ linprocfs_doprocstat(PFS_FILL_ARGS)
PS_ADD("pgrp", "%d", p->p_pgid);
PS_ADD("session", "%d", p->p_session->s_sid);
PROC_UNLOCK(p);
@@ -127,7 +131,7 @@
PS_ADD("startstack", "%u", 0); /* XXX */
PS_ADD("kstkesp", "%u", 0); /* XXX */
PS_ADD("kstkeip", "%u", 0); /* XXX */
-@@ -800,7 +840,7 @@
+@@ -728,7 +768,7 @@ linprocfs_doprocstatus(PFS_FILL_ARGS)
*/
sbuf_printf(sb, "VmSize:\t%8ju kB\n", B2K((uintmax_t)kp.ki_size));
sbuf_printf(sb, "VmLck:\t%8u kB\n", P2K(0)); /* XXX */
Modified: trunk/kfreebsd-7/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/902_version.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/902_version.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,10 @@
-Index: src/sys/conf/newvers.sh
-===================================================================
---- src.orig/sys/conf/newvers.sh
-+++ src/sys/conf/newvers.sh
-@@ -136,7 +136,7 @@
+---
+ sys/conf/newvers.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sys/conf/newvers.sh
++++ b/sys/conf/newvers.sh
+@@ -136,7 +136,7 @@ esac
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
Modified: trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/903_disable_non-free_drivers.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,16 @@
-Index: src/sys/conf/files
-===================================================================
---- src.orig/sys/conf/files
-+++ src/sys/conf/files
-@@ -476,180 +476,6 @@
+---
+ sys/amd64/conf/GENERIC | 6 -
+ sys/conf/files | 174 -------------------------------------------------
+ sys/conf/files.amd64 | 30 --------
+ sys/conf/files.i386 | 35 ---------
+ sys/conf/kern.pre.mk | 3
+ sys/i386/conf/GENERIC | 6 -
+ sys/modules/Makefile | 11 ---
+ 7 files changed, 265 deletions(-)
+
+--- a/sys/conf/files
++++ b/sys/conf/files
+@@ -476,180 +476,6 @@ dev/ata/atapi-cam.c optional atapicam
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
@@ -183,11 +191,9 @@
dev/awi/am79c930.c optional awi
dev/awi/awi.c optional awi
dev/awi/if_awi_pccard.c optional awi pccard
-Index: src/sys/conf/files.i386
-===================================================================
---- src.orig/sys/conf/files.i386
-+++ src/sys/conf/files.i386
-@@ -46,32 +46,6 @@
+--- a/sys/conf/files.i386
++++ b/sys/conf/files.i386
+@@ -46,32 +46,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -220,7 +226,7 @@
#
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
-@@ -173,14 +147,6 @@
+@@ -173,14 +147,6 @@ dev/fdc/fdc_pccard.c optional fdc pccar
dev/fe/if_fe_isa.c optional fe isa
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
@@ -235,7 +241,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -212,7 +178,6 @@
+@@ -212,7 +178,6 @@ dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
@@ -243,11 +249,9 @@
dev/nvram/nvram.c optional nvram isa
dev/pcf/pcf_isa.c optional pcf
dev/random/nehemiah.c optional random
-Index: src/sys/conf/kern.pre.mk
-===================================================================
---- src.orig/sys/conf/kern.pre.mk
-+++ src/sys/conf/kern.pre.mk
-@@ -65,9 +65,6 @@
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -65,9 +65,6 @@ INCLUDES+= -I$S/contrib/ipfilter
# ... and the same for pf
INCLUDES+= -I$S/contrib/pf
@@ -257,11 +261,9 @@
# ... and the same for the NgATM stuff
INCLUDES+= -I$S/contrib/ngatm
-Index: src/sys/i386/conf/GENERIC
-===================================================================
---- src.orig/sys/i386/conf/GENERIC
-+++ src/sys/i386/conf/GENERIC
-@@ -133,8 +133,6 @@
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
+@@ -133,8 +133,6 @@ device arcmsr # Areca SATA II RAID
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -270,7 +272,7 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -256,10 +254,6 @@
+@@ -256,10 +254,6 @@ device wlan_amrr # AMRR transmit rate c
device wlan_scan_ap # 802.11 AP mode scanning
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -281,11 +283,9 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-Index: src/sys/modules/Makefile
-===================================================================
---- src.orig/sys/modules/Makefile
-+++ src/sys/modules/Makefile
-@@ -31,7 +31,6 @@
+--- a/sys/modules/Makefile
++++ b/sys/modules/Makefile
+@@ -31,7 +31,6 @@ SUBDIR= ${_3dfx} \
${_arl} \
${_asr} \
ata \
@@ -293,7 +293,7 @@
aue \
${_auxio} \
${_awi} \
-@@ -105,8 +104,6 @@
+@@ -105,8 +104,6 @@ SUBDIR= ${_3dfx} \
hifn \
hme \
${_hptiop} \
@@ -302,7 +302,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -207,11 +204,9 @@
+@@ -207,11 +204,9 @@ SUBDIR= ${_3dfx} \
ntfs_iconv \
${_nxge} \
nullfs \
@@ -314,7 +314,7 @@
${_opensolaris} \
${_padlock} \
patm \
-@@ -476,8 +471,6 @@
+@@ -476,8 +471,6 @@ _cx= cx
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -323,7 +323,7 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -490,7 +483,6 @@
+@@ -490,7 +483,6 @@ _iwifw= iwifw
_ixgb= ixgb
_mly= mly
_nfe= nfe
@@ -331,7 +331,7 @@
_nvram= nvram
_nxge= nxge
_wpi= wpi
-@@ -540,8 +532,6 @@
+@@ -540,8 +532,6 @@ _em= em
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -340,7 +340,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -563,7 +553,6 @@
+@@ -563,7 +553,6 @@ _linux= linux
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -348,11 +348,9 @@
_nvram= nvram
_nxge= nxge
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-Index: src/sys/amd64/conf/GENERIC
-===================================================================
---- src.orig/sys/amd64/conf/GENERIC
-+++ src/sys/amd64/conf/GENERIC
-@@ -126,8 +126,6 @@
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
+@@ -126,8 +126,6 @@ device amr # AMI MegaRAID
device arcmsr # Areca SATA II RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -361,7 +359,7 @@
device iir # Intel Integrated RAID
device ips # IBM (Adaptec) ServeRAID
device mly # Mylex AcceleRAID/eXtremeRAID
-@@ -243,10 +241,6 @@
+@@ -243,10 +241,6 @@ device wlan_amrr # AMRR transmit rate c
device wlan_scan_ap # 802.11 AP mode scanning
device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
@@ -372,11 +370,9 @@
device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
-Index: src/sys/conf/files.amd64
-===================================================================
---- src.orig/sys/conf/files.amd64
-+++ src/sys/conf/files.amd64
-@@ -47,27 +47,6 @@
+--- a/sys/conf/files.amd64
++++ b/sys/conf/files.amd64
+@@ -47,27 +47,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -404,7 +400,7 @@
#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
-@@ -173,14 +152,6 @@
+@@ -173,14 +152,6 @@ dev/fdc/fdc.c optional fdc
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -419,7 +415,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -192,7 +163,6 @@
+@@ -192,7 +163,6 @@ dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
Modified: trunk/kfreebsd-7/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/904_dev_full.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/904_dev_full.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -2,11 +2,13 @@
Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
/dev/full already rejected in upstream (kern/68961)
-Index: src/sys/dev/null/null.c
-===================================================================
---- src.orig/sys/dev/null/null.c
-+++ src/sys/dev/null/null.c
-@@ -43,13 +43,16 @@
+---
+ sys/dev/null/null.c | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+
+--- a/sys/dev/null/null.c
++++ b/sys/dev/null/null.c
+@@ -43,13 +43,16 @@ __FBSDID("$FreeBSD$");
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -23,7 +25,7 @@
#define ZERO_MINOR 12
static struct cdevsw null_cdevsw = {
-@@ -60,6 +63,14 @@
+@@ -60,6 +63,14 @@ static struct cdevsw null_cdevsw = {
.d_name = "null",
};
@@ -38,7 +40,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -81,11 +92,25 @@
+@@ -81,11 +92,25 @@ null_write(struct cdev *dev __unused, st
/* ARGSUSED */
static int
@@ -64,7 +66,7 @@
if (cmd != DIOCSKERNELDUMP)
return (ENOIOCTL);
error = priv_check(td, PRIV_SETDUMPER);
-@@ -117,12 +137,15 @@
+@@ -117,12 +142,15 @@ null_modevent(module_t mod __unused, int
zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
null_dev = make_dev(&null_cdevsw, NULL_MINOR, UID_ROOT,
GID_WHEEL, 0666, "null");
Modified: trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/906_grow_sysv_ipc_limits.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -22,11 +22,14 @@
You might also want to configure your kernel to lock shared memory into RAM and prevent it from being paged out to swap. Use the sysctl setting kern.ipc.shm_use_phys.
</quote>
-Index: src/sys/i386/conf/GENERIC
-===================================================================
---- src.orig/sys/i386/conf/GENERIC
-+++ src/sys/i386/conf/GENERIC
-@@ -59,6 +59,12 @@
+---
+ sys/amd64/conf/GENERIC | 6 ++++++
+ sys/i386/conf/GENERIC | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
+@@ -59,6 +59,12 @@ options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
@@ -39,11 +42,9 @@
options P1003_1B_SEMAPHORES # POSIX-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-Index: src/sys/amd64/conf/GENERIC
-===================================================================
---- src.orig/sys/amd64/conf/GENERIC
-+++ src/sys/amd64/conf/GENERIC
-@@ -58,6 +58,12 @@
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
+@@ -58,6 +58,12 @@ options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
options SYSVSEM # SYSV-style semaphores
Modified: trunk/kfreebsd-7/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/907_cpu_class.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,11 +1,13 @@
Status: Rejected in upstream (kern/77355).
-Index: src/sys/i386/i386/identcpu.c
-===================================================================
---- src.orig/sys/i386/i386/identcpu.c
-+++ src/sys/i386/i386/identcpu.c
-@@ -626,6 +626,7 @@
+---
+ sys/i386/i386/identcpu.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/sys/i386/i386/identcpu.c
++++ b/sys/i386/i386/identcpu.c
+@@ -634,6 +634,7 @@ printcpuinfo(void)
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -13,7 +15,7 @@
bzero_vector = i486_bzero;
break;
#endif
-@@ -636,6 +637,7 @@
+@@ -644,6 +645,7 @@ printcpuinfo(void)
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("586");
@@ -21,7 +23,7 @@
break;
#endif
#if defined(I686_CPU)
-@@ -645,6 +647,7 @@
+@@ -653,6 +655,7 @@ printcpuinfo(void)
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("686");
Modified: trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/908_linprocfs_is_not_proc.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,10 @@
-Index: src/sys/compat/linprocfs/linprocfs.c
-===================================================================
---- src.orig/sys/compat/linprocfs/linprocfs.c
-+++ src/sys/compat/linprocfs/linprocfs.c
-@@ -338,10 +338,6 @@
+---
+ sys/compat/linprocfs/linprocfs.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/sys/compat/linprocfs/linprocfs.c
++++ b/sys/compat/linprocfs/linprocfs.c
+@@ -368,10 +368,6 @@ linprocfs_domtab(PFS_FILL_ARGS)
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
Modified: trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/910_GENERIC_hints.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,11 @@
-Index: src/sys/i386/conf/GENERIC.hints
-===================================================================
---- src.orig/sys/i386/conf/GENERIC.hints
-+++ src/sys/i386/conf/GENERIC.hints
-@@ -27,6 +27,7 @@
+---
+ sys/amd64/conf/GENERIC.hints | 1 +
+ sys/i386/conf/GENERIC.hints | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/sys/i386/conf/GENERIC.hints
++++ b/sys/i386/conf/GENERIC.hints
+@@ -27,6 +27,7 @@ hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
hint.psm.0.irq="12"
@@ -10,11 +13,9 @@
hint.vga.0.at="isa"
hint.sc.0.at="isa"
hint.sc.0.flags="0x100"
-Index: src/sys/amd64/conf/GENERIC.hints
-===================================================================
---- src.orig/sys/amd64/conf/GENERIC.hints
-+++ src/sys/amd64/conf/GENERIC.hints
-@@ -13,6 +13,7 @@
+--- a/sys/amd64/conf/GENERIC.hints
++++ b/sys/amd64/conf/GENERIC.hints
+@@ -13,6 +13,7 @@ hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
hint.psm.0.irq="12"
Modified: trunk/kfreebsd-7/debian/patches/911_no_werror.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/911_no_werror.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,22 +1,23 @@
-Index: src/sys/modules/hwpmc/Makefile
-===================================================================
---- src.orig/sys/modules/hwpmc/Makefile
-+++ src/sys/modules/hwpmc/Makefile
-@@ -9,6 +9,7 @@
+---
+ sys/modules/geom/geom_eli/Makefile | 1 +
+ sys/modules/hwpmc/Makefile | 1 +
+ 2 files changed, 2 insertions(+)
+
+--- a/sys/modules/hwpmc/Makefile
++++ b/sys/modules/hwpmc/Makefile
+@@ -9,6 +9,7 @@ KMOD= hwpmc
SRCS= hwpmc_mod.c hwpmc_logging.c vnode_if.h
WARNS?= 2
+NO_WERROR?= 1
.if ${MACHINE_ARCH} == "amd64"
- SRCS+= hwpmc_amd.c hwpmc_piv.c hwpmc_x86.c
-Index: src/sys/modules/geom/geom_eli/Makefile
-===================================================================
---- src.orig/sys/modules/geom/geom_eli/Makefile
-+++ src/sys/modules/geom/geom_eli/Makefile
-@@ -12,5 +12,6 @@
+ SRCS+= hwpmc_amd.c hwpmc_core.c hwpmc_intel.c hwpmc_piv.c hwpmc_tsc.c
+--- a/sys/modules/geom/geom_eli/Makefile
++++ b/sys/modules/geom/geom_eli/Makefile
+@@ -12,5 +12,6 @@ SRCS+= g_eli_privacy.c
SRCS+= pkcs5v2.c
SRCS+= vnode_if.h
WARNS?= 2
Modified: trunk/kfreebsd-7/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/912_binutils.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/912_binutils.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,5 +1,9 @@
---- a/sys/conf/ldscript.amd64 2004-05-29 03:09:00.000000000 +0200
-+++ b/sys/conf/ldscript.amd64 2010-03-29 21:27:35.000000000 +0200
+---
+ sys/conf/ldscript.amd64 | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/sys/conf/ldscript.amd64
++++ b/sys/conf/ldscript.amd64
@@ -1,12 +1,12 @@
/* $FreeBSD$ */
-OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
@@ -15,7 +19,7 @@
.interp : { *(.interp) }
.hash : { *(.hash) }
.dynsym : { *(.dynsym) }
-@@ -61,7 +61,8 @@
+@@ -61,7 +61,8 @@ SECTIONS
.eh_frame_hdr : { *(.eh_frame_hdr) }
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
Modified: trunk/kfreebsd-7/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/913_uudecode.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,16 @@
-Index: src/sys/modules/ipwfw/ipw_bss/Makefile
-===================================================================
---- src.orig/sys/modules/ipwfw/ipw_bss/Makefile
-+++ src/sys/modules/ipwfw/ipw_bss/Makefile
-@@ -9,7 +9,7 @@
+---
+ sys/modules/ipwfw/ipw_bss/Makefile | 2 +-
+ sys/modules/ipwfw/ipw_ibss/Makefile | 2 +-
+ sys/modules/ipwfw/ipw_monitor/Makefile | 2 +-
+ sys/modules/iwifw/iwi_bss/Makefile | 2 +-
+ sys/modules/iwifw/iwi_ibss/Makefile | 2 +-
+ sys/modules/iwifw/iwi_monitor/Makefile | 2 +-
+ sys/modules/wpifw/Makefile | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/sys/modules/ipwfw/ipw_bss/Makefile
++++ b/sys/modules/ipwfw/ipw_bss/Makefile
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
CLEANFILES= ipw_bss
ipw_bss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu
@@ -11,11 +19,9 @@
.include <bsd.kmod.mk>
-Index: src/sys/modules/ipwfw/ipw_ibss/Makefile
-===================================================================
---- src.orig/sys/modules/ipwfw/ipw_ibss/Makefile
-+++ src/sys/modules/ipwfw/ipw_ibss/Makefile
-@@ -9,7 +9,7 @@
+--- a/sys/modules/ipwfw/ipw_ibss/Makefile
++++ b/sys/modules/ipwfw/ipw_ibss/Makefile
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
CLEANFILES= ipw_ibss
ipw_ibss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu
@@ -24,11 +30,9 @@
.include <bsd.kmod.mk>
-Index: src/sys/modules/ipwfw/ipw_monitor/Makefile
-===================================================================
---- src.orig/sys/modules/ipwfw/ipw_monitor/Makefile
-+++ src/sys/modules/ipwfw/ipw_monitor/Makefile
-@@ -9,7 +9,7 @@
+--- a/sys/modules/ipwfw/ipw_monitor/Makefile
++++ b/sys/modules/ipwfw/ipw_monitor/Makefile
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
CLEANFILES= ipw_monitor
ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
@@ -37,11 +41,9 @@
.include <bsd.kmod.mk>
-Index: src/sys/modules/iwifw/iwi_bss/Makefile
-===================================================================
---- src.orig/sys/modules/iwifw/iwi_bss/Makefile
-+++ src/sys/modules/iwifw/iwi_bss/Makefile
-@@ -9,7 +9,7 @@
+--- a/sys/modules/iwifw/iwi_bss/Makefile
++++ b/sys/modules/iwifw/iwi_bss/Makefile
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
CLEANFILES= iwi_bss
iwi_bss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu
@@ -50,11 +52,9 @@
.include <bsd.kmod.mk>
-Index: src/sys/modules/iwifw/iwi_ibss/Makefile
-===================================================================
---- src.orig/sys/modules/iwifw/iwi_ibss/Makefile
-+++ src/sys/modules/iwifw/iwi_ibss/Makefile
-@@ -9,7 +9,7 @@
+--- a/sys/modules/iwifw/iwi_ibss/Makefile
++++ b/sys/modules/iwifw/iwi_ibss/Makefile
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
CLEANFILES= iwi_fw
iwi_ibss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu
@@ -63,11 +63,9 @@
.include <bsd.kmod.mk>
-Index: src/sys/modules/iwifw/iwi_monitor/Makefile
-===================================================================
---- src.orig/sys/modules/iwifw/iwi_monitor/Makefile
-+++ src/sys/modules/iwifw/iwi_monitor/Makefile
-@@ -9,7 +9,7 @@
+--- a/sys/modules/iwifw/iwi_monitor/Makefile
++++ b/sys/modules/iwifw/iwi_monitor/Makefile
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
CLEANFILES= iwi_monitor
iwi_monitor: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu
@@ -76,11 +74,9 @@
.include <bsd.kmod.mk>
-Index: src/sys/modules/wpifw/Makefile
-===================================================================
---- src.orig/sys/modules/wpifw/Makefile
-+++ src/sys/modules/wpifw/Makefile
-@@ -9,6 +9,6 @@
+--- a/sys/modules/wpifw/Makefile
++++ b/sys/modules/wpifw/Makefile
+@@ -9,6 +9,6 @@ FIRMWARE_LICENSE= intel_wpi
CLEANFILES= iwlwifi-3945-2.14.4.fw
iwlwifi-3945-2.14.4.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu
Modified: trunk/kfreebsd-7/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/914_psm.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/914_psm.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,9 +5,13 @@
|
| This makes Xorg happy if you aren't using moused.
---- src.orig/sys/dev/atkbdc/psm.c
-+++ src/sys/dev/atkbdc/psm.c
-@@ -70,10 +70,7 @@
+---
+ sys/dev/atkbdc/psm.c | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
+--- a/sys/dev/atkbdc/psm.c
++++ b/sys/dev/atkbdc/psm.c
+@@ -70,10 +70,7 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
#include <sys/conf.h>
@@ -18,7 +22,7 @@
#include <sys/syslog.h>
#include <machine/bus.h>
#include <sys/rman.h>
-@@ -215,7 +212,6 @@
+@@ -215,7 +212,6 @@ struct psm_softc { /* Driver status inf
struct cdev *bdev;
int lasterr;
int cmdcount;
@@ -26,7 +30,7 @@
};
static devclass_t psm_devclass;
#define PSM_SOFTC(unit) \
-@@ -1387,7 +1383,6 @@
+@@ -1387,7 +1383,6 @@ psmopen(struct cdev *dev, int flag, int
sc->mode.level = sc->dflt_mode.level;
sc->mode.protocol = sc->dflt_mode.protocol;
sc->watchdog = FALSE;
@@ -34,7 +38,7 @@
/* flush the event queue */
sc->queue.count = 0;
-@@ -1527,12 +1522,6 @@
+@@ -1527,12 +1522,6 @@ psmclose(struct cdev *dev, int flag, int
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -47,7 +51,7 @@
/* close is almost always successful */
sc->state &= ~PSM_OPEN;
kbdc_lock(sc->kbdc, FALSE);
-@@ -2094,15 +2083,6 @@
+@@ -2094,15 +2083,6 @@ psmioctl(struct cdev *dev, u_long cmd, c
break;
#endif /* MOUSE_GETHWID */
@@ -63,7 +67,7 @@
default:
return (ENOTTY);
}
-@@ -2992,9 +2972,6 @@
+@@ -2992,9 +2972,6 @@ next:
wakeup(sc);
}
selwakeuppri(&sc->rsel, PZERO);
Modified: trunk/kfreebsd-7/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/915_ip6.v6only.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/915_ip6.v6only.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/netinet6/in6_proto.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -386,7 +386,7 @@
+@@ -386,7 +386,7 @@ int ip6_use_deprecated = 1; /* allow dep
int ip6_rr_prune = 5; /* router renumbering prefix
* walk list every 5 sec. */
int ip6_mcast_pmtu = 0; /* enable pMTU discovery for multicast? */
Modified: trunk/kfreebsd-7/debian/patches/916_ip6.accept_rtadv.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/916_ip6.accept_rtadv.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/916_ip6.accept_rtadv.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/netinet6/in6_proto.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ int ip6_forwarding = IPV6FORWARDING; /*
int ip6_sendredirects = IPV6_SENDREDIRECTS;
int ip6_defhlim = IPV6_DEFHLIM;
int ip6_defmcasthlim = IPV6_DEFAULT_MULTICAST_HOPS;
Modified: trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/950_no_stack_protector.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -6,9 +6,13 @@
- different init order
- ...
+---
+ sys/conf/kmod.mk | 3 +++
+ 1 file changed, 3 insertions(+)
+
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -128,6 +128,9 @@
+@@ -129,6 +129,9 @@ CFLAGS+= -fno-omit-frame-pointer
CFLAGS+= -mlongcall -fno-omit-frame-pointer
.endif
Modified: trunk/kfreebsd-7/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-7/debian/patches/999_config.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/patches/999_config.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,5 +1,10 @@
---- a/sys/amd64/conf/GENERIC 2010-03-29 21:26:18.000000000 +0200
-+++ b/sys/amd64/conf/GENERIC 2010-03-29 21:28:02.000000000 +0200
+---
+ sys/amd64/conf/GENERIC | 37 ++++++++++++++++---------------------
+ sys/i386/conf/GENERIC | 41 ++++++++++++++++++-----------------------
+ 2 files changed, 34 insertions(+), 44 deletions(-)
+
+--- a/sys/amd64/conf/GENERIC
++++ b/sys/amd64/conf/GENERIC
@@ -18,13 +18,13 @@
#
# $FreeBSD$
@@ -18,7 +23,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ options COMPAT_IA32 # Compatible with
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
@@ -27,7 +32,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ options AUDIT # Security event auditi
options INCLUDE_CONFIG_FILE # Include this file in kernel
# Make an SMP-capable kernel by default
@@ -36,7 +41,7 @@
# CPU frequency control
device cpufreq
-@@ -84,9 +84,6 @@
+@@ -84,9 +84,6 @@ device cpufreq
device acpi
device pci
@@ -46,7 +51,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -94,6 +91,8 @@
+@@ -94,6 +91,8 @@ device ataraid # ATA RAID drives
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -55,7 +60,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -176,10 +175,6 @@
+@@ -176,10 +175,6 @@ device uart # Generic UART driver
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -66,7 +71,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -256,13 +251,8 @@
+@@ -256,13 +251,8 @@ device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -80,7 +85,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -279,11 +269,8 @@
+@@ -279,11 +269,8 @@ device usb # USB Bus (required)
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -92,7 +97,7 @@
# USB Serial devices
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
-@@ -313,3 +300,11 @@
+@@ -313,3 +300,11 @@ device fwe # Ethernet over FireWire (n
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -104,8 +109,8 @@
+options ALTQ_RIO # RED In/Out
+options ALTQ_HFSC # Hierarchical Packet Scheduler (HFSC)
+options ALTQ_PRIQ # Priority Queuing (PRIQ)
---- a/sys/i386/conf/GENERIC 2010-03-29 21:26:18.000000000 +0200
-+++ b/sys/i386/conf/GENERIC 2010-03-29 21:28:02.000000000 +0200
+--- a/sys/i386/conf/GENERIC
++++ b/sys/i386/conf/GENERIC
@@ -18,15 +18,15 @@
#
# $FreeBSD$
@@ -128,7 +133,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ options COMPAT_43TTY # BSD 4.3 TTY com
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
@@ -137,7 +142,7 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ options AUDIT # Security event auditi
options INCLUDE_CONFIG_FILE # Include this file in kernel
# To make an SMP kernel, the next two lines are needed
@@ -146,7 +151,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -85,9 +85,6 @@
+@@ -85,9 +85,6 @@ device cpufreq
device eisa
device pci
@@ -156,7 +161,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -95,6 +92,8 @@
+@@ -95,6 +92,8 @@ device ataraid # ATA RAID drives
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -165,7 +170,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -187,10 +186,6 @@
+@@ -187,10 +186,6 @@ device uart # Generic UART driver
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -176,7 +181,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -270,13 +265,8 @@
+@@ -270,13 +265,8 @@ device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -190,7 +195,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -293,11 +283,8 @@
+@@ -293,11 +283,8 @@ device usb # USB Bus (required)
device ugen # Generic
device uhid # "Human Interface Devices"
device ukbd # Keyboard
@@ -202,7 +207,7 @@
# USB Serial devices
device ucom # Generic com ttys
device uark # Technologies ARK3116 based serial adapters
-@@ -327,3 +314,11 @@
+@@ -327,3 +314,11 @@ device fwe # Ethernet over FireWire (n
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-7/debian/rules
===================================================================
--- trunk/kfreebsd-7/debian/rules 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-7/debian/rules 2011-05-26 02:53:11 UTC (rev 3329)
@@ -31,8 +31,6 @@
MAKE := make MACHINE_ARCH=$(cpu) CC=gcc-4.3 WERROR=
PATH := $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
-include /usr/share/quilt/quilt.make
-
get-orig-source:
rm -rf $(ORIG_DIR)
for i in sys usr.sbin/config ; do \
@@ -55,7 +53,7 @@
done ; \
done
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf src kfreebsd-source-* flavor-* config
@@ -69,8 +67,6 @@
src: src-stamp
src-stamp:
- QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
-
mkdir $(CURDIR)/src
cp -af $(CURDIR)/sys $(CURDIR)/usr.sbin $(CURDIR)/src
Added: trunk/kfreebsd-7/debian/source/format
===================================================================
--- trunk/kfreebsd-7/debian/source/format (rev 0)
+++ trunk/kfreebsd-7/debian/source/format 2011-05-26 02:53:11 UTC (rev 3329)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: trunk/kfreebsd-8/debian/README.source
===================================================================
--- trunk/kfreebsd-8/debian/README.source 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/README.source 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/changelog 2011-05-26 02:53:11 UTC (rev 3329)
@@ -2,6 +2,11 @@
[ Guillem Jover ]
* Now using Standards-Version 3.9.2 (no changes needed).
+ * Switch to source format “3.0 (quilt)”.
+ - Remove quilt from Build-Depends.
+ - Remove patch target in debian/rules.
+ - Remove now unneeded README.source.
+ - Refresh all patches.
-- Aurelien Jarno <aurel32 at debian.org> Sat, 19 Feb 2011 23:01:52 +0100
Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/control.in 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,7 +5,7 @@
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-@major@/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
-Build-Depends: debhelper (>= 5.0.0), bzip2, quilt, sharutils, flex-old | flex,
+Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
freebsd-buildutils (>= 8.1-2) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
gcc-4.3, libdb-dev,
libbsd-dev, libsbuf-dev
Modified: trunk/kfreebsd-8/debian/patches/000_coda.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_coda.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/000_coda.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,9 @@
+---
+ sys/fs/coda/coda.h | 6 ++++--
+ sys/fs/coda/coda_venus.c | 6 ++++++
+ sys/fs/coda/coda_vnops.c | 3 ++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
--- a/sys/fs/coda/coda.h
+++ b/sys/fs/coda/coda.h
@@ -41,7 +41,9 @@
@@ -10,7 +16,7 @@
/* Avoid CODA_COMPAT_5 redefinition in coda5 module */
#if defined (CODA5_MODULE) && !defined(CODA_COMPAT_5)
-@@ -782,8 +784,8 @@
+@@ -782,8 +784,8 @@ union coda_downcalls {
#define PIOCPARM_MASK 0x0000ffff
struct ViceIoctl {
caddr_t in, out; /* Data to be transferred in, or out */
@@ -23,7 +29,7 @@
#if defined(__CYGWIN32__) || defined(DJGPP)
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
-@@ -274,6 +274,12 @@
+@@ -274,6 +274,12 @@ venus_ioctl(void *mdp, struct CodaFid *f
tmp = ((com >> 16) & IOCPARM_MASK) - sizeof (char *) - sizeof (int);
inp->cmd |= (tmp & IOCPARM_MASK) << 16;
@@ -38,7 +44,7 @@
inp->data = (char *)(sizeof (struct coda_ioctl_in));
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
-@@ -471,7 +471,8 @@
+@@ -471,7 +471,8 @@ coda_ioctl(struct vop_ioctl_args *ap)
iap->path)););
return (EINVAL);
}
Modified: trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/000_t_delta_warning.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,9 +1,13 @@
Backport from upstream trunk (r209900)
+---
+ sys/kern/kern_tc.c | 50 ++++++++++++++------------------------------------
+ 1 file changed, 14 insertions(+), 36 deletions(-)
+
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
-@@ -864,43 +864,21 @@
+@@ -876,43 +876,21 @@ cpu_tick_calibrate(int reset)
t_delta = t_this;
bintime_sub(&t_delta, &t_last);
/*
Modified: trunk/kfreebsd-8/debian/patches/001_misc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/001_misc.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/001_misc.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -2,6 +2,10 @@
Status: chflags is BSD-specific. We could add it to freebsd-utils.
The rest has been rejected (kern/93502)
+---
+ sys/conf/kern.mk | 18 +++++++++++++++---
+ 1 file changed, 15 insertions(+), 3 deletions(-)
+
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -1,5 +1,9 @@
@@ -31,7 +35,7 @@
.if !defined(WITH_GCC3)
_Wno_pointer_sign=-Wno-pointer-sign
.endif
-@@ -36,8 +44,12 @@
+@@ -36,8 +44,12 @@ _wundef= -Wundef
# reserved for user applications.
#
.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
Modified: trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/003_glibc_dev_aicasm.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,17 @@
+---
+ sys/dev/aic7xxx/aicasm/Makefile | 10 ++--------
+ sys/dev/aic7xxx/aicasm/aicasm.h | 5 +++--
+ sys/dev/aic7xxx/aicasm/aicasm_gram.y | 7 ++++---
+ sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y | 5 +++--
+ sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l | 6 ++++--
+ sys/dev/aic7xxx/aicasm/aicasm_scan.l | 6 ++++--
+ sys/dev/aic7xxx/aicasm/aicasm_symbol.c | 7 ++++---
+ sys/dev/aic7xxx/aicasm/aicasm_symbol.h | 5 +++--
+ 8 files changed, 27 insertions(+), 24 deletions(-)
+
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
-@@ -14,8 +14,9 @@
+@@ -14,8 +14,9 @@ GENHDRS= aicasm_gram.h aicasm_macro_gram
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
DPADD= ${LIBL}
@@ -11,7 +22,7 @@
# Correct path for kernel builds
# Don't rely on the kernel's .depend file
-@@ -24,13 +25,6 @@
+@@ -24,13 +25,6 @@ WARNS?= 6
DEPENDFILE= .depend_aicasm
.endif
@@ -53,7 +64,7 @@
#else
#include <sys/queue.h>
#endif
-@@ -1534,7 +1535,7 @@
+@@ -1534,7 +1535,7 @@ initialize_symbol(symbol_t *symbol)
}
static void
Modified: trunk/kfreebsd-8/debian/patches/004_xargs.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/004_xargs.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/004_xargs.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,10 +1,14 @@
Status: xargs -J option requested to both upstream and debian.
-diff -ur a/sys/conf/kmod.mk b/sys/conf/kmod.mk
---- a/sys/conf/kmod.mk 2010-07-22 20:47:41.000000000 +0200
-+++ b/sys/conf/kmod.mk 2010-11-09 00:29:56.000000000 +0100
-@@ -220,7 +220,7 @@
+---
+ sys/conf/kmod.mk | 2 +-
+ sys/contrib/dev/acpica/acpica_prep.sh | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sys/conf/kmod.mk
++++ b/sys/conf/kmod.mk
+@@ -207,7 +207,7 @@ ${FULLPROG}: ${OBJS}
grep -v '^#' < ${EXPORT_SYMS} > export_syms
.endif
awk -f ${SYSDIR}/conf/kmod_syms.awk ${.TARGET} \
@@ -13,11 +17,9 @@
.endif
.endif
.if !defined(DEBUG_FLAGS) && \
-Només a b/sys/conf: kmod.mk.orig
-diff -ur a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
---- a/sys/contrib/dev/acpica/acpica_prep.sh 2010-07-06 22:57:28.000000000 +0200
-+++ b/sys/contrib/dev/acpica/acpica_prep.sh 2010-11-09 00:30:19.000000000 +0100
-@@ -59,10 +59,10 @@
+--- a/sys/contrib/dev/acpica/acpica_prep.sh
++++ b/sys/contrib/dev/acpica/acpica_prep.sh
+@@ -59,10 +59,10 @@ done
# copy files
echo copying full dirs
for i in ${fulldirs}; do
Modified: trunk/kfreebsd-8/debian/patches/007_clone_signals.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/007_clone_signals.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/007_clone_signals.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,11 @@
+---
+ sys/kern/kern_fork.c | 8 +++++++-
+ sys/sys/unistd.h | 4 ++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
-@@ -562,7 +562,13 @@
+@@ -564,7 +564,13 @@ again:
p2->p_sigacts = newsigacts;
}
if (flags & RFLINUXTHPN)
Modified: trunk/kfreebsd-8/debian/patches/008_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/008_config.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/008_config.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -3,6 +3,12 @@
Status: gotta uncomment WARNS (see #351366), and find a portable way to add
"-lbsd". after this it can be sent upstream.
+---
+ usr.sbin/config/Makefile | 6 +++---
+ usr.sbin/config/config.h | 2 +-
+ usr.sbin/config/main.c | 11 ++++++++++-
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+
--- a/usr.sbin/config/config.h
+++ b/usr.sbin/config/config.h
@@ -34,7 +34,7 @@
@@ -16,7 +22,7 @@
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
-@@ -41,12 +41,17 @@
+@@ -41,12 +41,17 @@ static const char rcsid[] =
"$FreeBSD$";
#endif /* not lint */
@@ -35,7 +41,7 @@
#include <assert.h>
#include <ctype.h>
-@@ -607,7 +612,11 @@
+@@ -618,7 +623,11 @@ cleanheaders(char *p)
if ((dirp = opendir(p)) == NULL)
err(EX_OSERR, "opendir %s", p);
while ((dp = readdir(dirp)) != NULL) {
@@ -49,7 +55,7 @@
continue;
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
-@@ -9,11 +9,11 @@
+@@ -9,11 +9,11 @@ SRCS= config.y main.c lang.l mkmakefile.
kernconf.c: kernconf.tmpl
file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
Modified: trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/009_disable_duped_modules.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,9 +1,21 @@
Status: in upstream BTS
+---
+ sys/conf/Makefile.amd64 | 2 ++
+ sys/conf/Makefile.arm | 2 ++
+ sys/conf/Makefile.i386 | 2 ++
+ sys/conf/Makefile.ia64 | 2 ++
+ sys/conf/Makefile.mips | 2 ++
+ sys/conf/Makefile.pc98 | 2 ++
+ sys/conf/Makefile.powerpc | 2 ++
+ sys/conf/Makefile.sparc64 | 2 ++
+ usr.sbin/config/mkmakefile.c | 25 +++++++++++++++++++++++++
+ 9 files changed, 41 insertions(+)
+
--- a/sys/conf/Makefile.amd64
+++ b/sys/conf/Makefile.amd64
-@@ -40,6 +40,8 @@
+@@ -40,6 +40,8 @@ CFLAGS+= -fno-omit-frame-pointer
MKMODULESENV+= MACHINE=amd64
@@ -14,7 +26,7 @@
%OBJS
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
-@@ -121,6 +121,8 @@
+@@ -121,6 +121,8 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$
MKMODULESENV+= MACHINE=${MACHINE}
@@ -25,7 +37,7 @@
%OBJS
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
-@@ -34,6 +34,8 @@
+@@ -34,6 +34,8 @@ MACHINE=i386
MKMODULESENV+= MACHINE=${MACHINE}
@@ -36,7 +48,7 @@
%OBJS
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
-@@ -36,6 +36,8 @@
+@@ -36,6 +36,8 @@ CFLAGS+= -mconstant-gp
ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
@@ -47,7 +59,7 @@
%OBJS
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
-@@ -105,6 +105,8 @@
+@@ -97,6 +97,8 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/
${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
${KERNEL_KO}.tramp.bin \
@@ -58,7 +70,7 @@
%OBJS
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
-@@ -34,6 +34,8 @@
+@@ -34,6 +34,8 @@ MACHINE=pc98
MKMODULESENV+= MACHINE=${MACHINE}
@@ -69,7 +81,7 @@
%OBJS
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
-@@ -37,6 +37,8 @@
+@@ -37,6 +37,8 @@ DDB_ENABLED!= grep DDB opt_ddb.h || true
CFLAGS+= -fno-omit-frame-pointer
.endif
@@ -80,7 +92,7 @@
%OBJS
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
-@@ -32,6 +32,8 @@
+@@ -32,6 +32,8 @@ S= ../../..
MDOBJS= exception.o interrupt.o
@@ -91,7 +103,7 @@
%OBJS
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
-@@ -70,6 +70,7 @@
+@@ -70,6 +70,7 @@ static void do_clean(FILE *);
static void do_rules(FILE *);
static void do_xxfiles(char *, FILE *);
static void do_objs(FILE *);
@@ -99,7 +111,7 @@
static void do_before_depend(FILE *);
static int opteq(const char *, const char *);
static void read_files(void);
-@@ -146,6 +147,8 @@
+@@ -159,6 +160,8 @@ makefile(void)
}
if (eq(line, "%BEFORE_DEPEND\n"))
do_before_depend(ofp);
@@ -108,7 +120,7 @@
else if (eq(line, "%OBJS\n"))
do_objs(ofp);
else if (strncmp(line, "%FILES.", 7) == 0)
-@@ -626,6 +629,28 @@
+@@ -630,6 +633,28 @@ do_objs(FILE *fp)
}
static void
Modified: trunk/kfreebsd-8/debian/patches/013_ip_packed.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/013_ip_packed.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/013_ip_packed.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/netinet/ip.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ struct ip {
u_char ip_p; /* protocol */
u_short ip_sum; /* checksum */
struct in_addr ip_src,ip_dst; /* source and dest address */
Modified: trunk/kfreebsd-8/debian/patches/020_linker.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/020_linker.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/020_linker.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -4,9 +4,14 @@
for details see http://sourceware.org/bugzilla/show_bug.cgi?id=5391
+---
+ sys/conf/kern.post.mk | 4 +++-
+ sys/conf/kmod.mk | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
-@@ -85,7 +85,9 @@
+@@ -85,7 +85,9 @@ gdbinit:
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
@rm -f ${.TARGET}
@echo linking ${.TARGET}
@@ -19,9 +24,9 @@
.endif
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -176,7 +176,9 @@
+@@ -180,7 +180,9 @@ ${PROG}.symbols: ${FULLPROG}
- .if ${MACHINE_ARCH} != amd64
+ .if ${MACHINE_ARCH} != amd64 && ${MACHINE_ARCH} != mips
${FULLPROG}: ${KMOD}.kld
- ${LD} -Bshareable ${LDFLAGS} -o ${.TARGET} ${KMOD}.kld
+ gen-ld-u-options ${KMOD}.kld > ${KMOD}.lopt
Modified: trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/021_superpages_i386.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,9 +1,13 @@
+---
+ sys/i386/i386/pmap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
-@@ -217,7 +217,7 @@
+@@ -219,7 +219,7 @@ static int pat_works = 1;
+ SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1,
+ "Is page attribute table fully functional?");
- SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
-
-static int pg_ps_enabled;
+static int pg_ps_enabled = 1;
SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RDTUN, &pg_ps_enabled, 0,
Modified: trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/103_stat_pipe.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/kern/sys_pipe.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
-@@ -1405,6 +1405,8 @@
+@@ -1405,6 +1405,8 @@ pipe_stat(fp, ub, active_cred, td)
struct thread *td;
{
struct pipe *pipe = fp->f_data;
@@ -9,7 +13,7 @@
#ifdef MAC
int error;
-@@ -1431,6 +1433,8 @@
+@@ -1431,6 +1433,8 @@ pipe_stat(fp, ub, active_cred, td)
* Left as 0: st_dev, st_ino, st_nlink, st_rdev, st_flags, st_gen.
* XXX (st_dev, st_ino) should be unique.
*/
Modified: trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,13 @@
+---
+ sys/amd64/acpica/acpi_machdep.c | 457 +++++++++++++++++++++++++++++++++++++++-
+ sys/amd64/include/apm_bios.h | 264 +++++++++++++++++++++++
+ sys/dev/acpica/acpi.c | 6
+ sys/i386/include/apm_bios.h | 12 -
+ 4 files changed, 719 insertions(+), 20 deletions(-)
+
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
-@@ -2315,9 +2315,7 @@
+@@ -2315,9 +2315,7 @@ int
acpi_ReqSleepState(struct acpi_softc *sc, int state)
{
#if defined(__amd64__) || defined(__i386__)
@@ -10,7 +17,7 @@
ACPI_STATUS status;
if (state < ACPI_STATE_S1 || state > ACPI_S_STATES_MAX)
-@@ -2342,7 +2340,6 @@
+@@ -2342,7 +2340,6 @@ acpi_ReqSleepState(struct acpi_softc *sc
/* Record the pending state and notify all apm devices. */
sc->acpi_next_sstate = state;
@@ -18,7 +25,7 @@
STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
clone->notify_status = APM_EV_NONE;
if ((clone->flags & ACPI_EVF_DEVD) == 0) {
-@@ -2350,7 +2347,6 @@
+@@ -2350,7 +2347,6 @@ acpi_ReqSleepState(struct acpi_softc *sc
KNOTE_LOCKED(&clone->sel_read.si_note, 0);
}
}
@@ -26,7 +33,7 @@
/* If devd(8) is not running, immediately enter the sleep state. */
if (!devctl_process_running()) {
-@@ -2418,7 +2414,6 @@
+@@ -2418,7 +2414,6 @@ acpi_AckSleepState(struct apm_clone_data
* are writable since read-only devices couldn't ack the request.
*/
sleeping = TRUE;
@@ -34,7 +41,7 @@
clone->notify_status = APM_EV_ACKED;
STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
if ((clone->flags & ACPI_EVF_WRITE) != 0 &&
-@@ -2427,7 +2422,6 @@
+@@ -2427,7 +2422,6 @@ acpi_AckSleepState(struct apm_clone_data
break;
}
}
@@ -44,7 +51,7 @@
if (sleeping)
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
-@@ -230,12 +230,12 @@
+@@ -230,12 +230,12 @@ typedef struct apm_pwstatus {
} *apm_pwstatus_t;
struct apm_bios_arg {
@@ -65,7 +72,7 @@
struct apm_event_info {
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
-@@ -44,6 +44,24 @@
+@@ -44,6 +44,24 @@ __FBSDID("$FreeBSD$");
#include <machine/nexusvar.h>
@@ -90,7 +97,7 @@
SYSCTL_DECL(_debug_acpi);
int acpi_resume_beep;
-@@ -55,7 +73,432 @@
+@@ -55,7 +73,432 @@ int acpi_reset_video;
TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
static int intr_model = ACPI_INTR_PIC;
@@ -524,7 +531,7 @@
int
acpi_machdep_init(device_t dev)
-@@ -64,14 +507,12 @@
+@@ -64,14 +507,12 @@ acpi_machdep_init(device_t dev)
sc = devclass_get_softc(devclass_find("acpi"), 0);
Modified: trunk/kfreebsd-8/debian/patches/106_teken_op.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/106_teken_op.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/106_teken_op.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,11 @@
+---
+ sys/dev/syscons/teken/sequences | 1 +
+ sys/dev/syscons/teken/teken_subr_compat.h | 14 ++++++++++++++
+ 2 files changed, 15 insertions(+)
+
--- a/sys/dev/syscons/teken/teken_subr_compat.h
+++ b/sys/dev/syscons/teken/teken_subr_compat.h
-@@ -75,6 +75,20 @@
+@@ -75,6 +75,20 @@ teken_subr_cons25_set_bell_pitch_duratio
(duration & 0xffff));
}
@@ -23,7 +28,7 @@
teken_subr_vt52_decid(teken_t *t)
--- a/sys/dev/syscons/teken/sequences
+++ b/sys/dev/syscons/teken/sequences
-@@ -104,6 +104,7 @@
+@@ -104,6 +104,7 @@ C25ADBG Cons25 set adapter background ^
C25ADFG Cons25 set adapter foreground ^[ [ = F r
C25BLPD Cons25 set bell pitch duration ^[ [ = B r r
C25CURS Cons25 set cursor type ^[ [ = S r
Modified: trunk/kfreebsd-8/debian/patches/107_mount_update.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/107_mount_update.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/107_mount_update.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/kern/vfs_mount.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
-@@ -559,10 +559,10 @@
+@@ -559,10 +559,10 @@ vfs_donmount(struct thread *td, int fsfl
struct vfsopt *opt, *noro_opt, *tmp_opt;
char *fstype, *fspath, *errmsg;
int error, fstypelen, fspathlen, errmsg_len, errmsg_pos;
@@ -13,7 +17,7 @@
errmsg_pos = -1;
error = vfs_buildopts(fsoptions, &optlist);
-@@ -659,10 +659,8 @@
+@@ -659,10 +659,8 @@ vfs_donmount(struct thread *td, int fsfl
fsflags &= ~MNT_RDONLY;
has_noro = 1;
}
@@ -25,7 +29,7 @@
else if (strcmp(opt->name, "ro") == 0)
fsflags |= MNT_RDONLY;
else if (strcmp(opt->name, "rdonly") == 0) {
-@@ -684,7 +682,7 @@
+@@ -684,7 +682,7 @@ vfs_donmount(struct thread *td, int fsfl
* we need a mount option "noro", since in vfs_mergeopts(),
* "noro" will cancel "ro", but "rw" will not do anything.
*/
Modified: trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/108_teken_utf8_table.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/dev/syscons/scterm-teken.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
--- a/sys/dev/syscons/scterm-teken.c
+++ b/sys/dev/syscons/scterm-teken.c
-@@ -356,10 +356,18 @@
+@@ -356,10 +356,18 @@ static const struct unicp437 cp437table[
{ 0x00b6, 0x14, 0x00 }, { 0x00b7, 0xfa, 0x00 },
{ 0x00ba, 0xa7, 0x00 }, { 0x00bb, 0xaf, 0x00 },
{ 0x00bc, 0xac, 0x00 }, { 0x00bd, 0xab, 0x00 },
@@ -23,7 +27,7 @@
{ 0x00df, 0xe1, 0x00 }, { 0x00e0, 0x85, 0x00 },
{ 0x00e1, 0xa0, 0x00 }, { 0x00e2, 0x83, 0x00 },
{ 0x00e4, 0x84, 0x00 }, { 0x00e5, 0x86, 0x00 },
-@@ -374,6 +382,7 @@
+@@ -374,6 +382,7 @@ static const struct unicp437 cp437table[
{ 0x00f8, 0xed, 0x00 }, { 0x00f9, 0x97, 0x00 },
{ 0x00fa, 0xa3, 0x00 }, { 0x00fb, 0x96, 0x00 },
{ 0x00fc, 0x81, 0x00 }, { 0x00ff, 0x98, 0x00 },
@@ -31,7 +35,7 @@
{ 0x0192, 0x9f, 0x00 }, { 0x0393, 0xe2, 0x00 },
{ 0x0398, 0xe9, 0x00 }, { 0x03a3, 0xe4, 0x00 },
{ 0x03a6, 0xe8, 0x00 }, { 0x03a9, 0xea, 0x00 },
-@@ -422,7 +431,8 @@
+@@ -422,7 +431,8 @@ static const struct unicp437 cp437table[
{ 0x2584, 0xdc, 0x00 }, { 0x2588, 0xdb, 0x00 },
{ 0x258c, 0xdd, 0x00 }, { 0x2590, 0xde, 0x00 },
{ 0x2591, 0xb0, 0x02 }, { 0x25a0, 0xfe, 0x00 },
Modified: trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/109_linprocfs_non_x86.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/conf/options.mips | 3 +++
+ 1 file changed, 3 insertions(+)
+
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
-@@ -56,6 +56,9 @@
+@@ -56,6 +56,9 @@ TARGET_EMULATOR opt_ddb.h
TICK_USE_YAMON_FREQ opt_global.h
TICK_USE_MALTA_RTC opt_global.h
Modified: trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/110_disable_trampoline_flavour.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/conf/Makefile.mips | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
-@@ -79,7 +79,7 @@
+@@ -71,7 +71,7 @@ HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_
# XXX hardcoded kernel entry point
ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE
Modified: trunk/kfreebsd-8/debian/patches/200_xen.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/200_xen.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/200_xen.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,11 @@
+---
+ sys/dev/xen/evtchn/evtchn_dev.c | 2 +-
+ sys/xen/evtchn/evtchn_dev.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
--- a/sys/dev/xen/evtchn/evtchn_dev.c
+++ b/sys/dev/xen/evtchn/evtchn_dev.c
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ typedef struct evtchn_sotfc {
} evtchn_softc_t;
@@ -11,7 +16,7 @@
#endif
--- a/sys/xen/evtchn/evtchn_dev.c
+++ b/sys/xen/evtchn/evtchn_dev.c
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ typedef struct evtchn_sotfc {
} evtchn_softc_t;
Modified: trunk/kfreebsd-8/debian/patches/902_version.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/902_version.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/902_version.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/conf/newvers.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ esac
cat << EOF > vers.c
$COPYRIGHT
#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
Modified: trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/903_disable_non-free_drivers.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,14 @@
+---
+ sys/amd64/conf/GENERIC | 2 --
+ sys/conf/files.amd64 | 29 -----------------------------
+ sys/conf/files.i386 | 30 ------------------------------
+ sys/i386/conf/GENERIC | 2 --
+ sys/modules/Makefile | 9 ---------
+ 5 files changed, 72 deletions(-)
+
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
-@@ -46,27 +46,6 @@
+@@ -46,27 +46,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -28,7 +36,7 @@
compat/linprocfs/linprocfs.c optional linprocfs
compat/linsysfs/linsysfs.c optional linsysfs
compat/linux/linux_emul.c optional compat_linux
-@@ -164,14 +143,6 @@
+@@ -172,14 +151,6 @@ dev/fdc/fdc_pccard.c optional fdc pccar
dev/fe/if_fe_isa.c optional fe isa
dev/glxsb/glxsb.c optional glxsb
dev/glxsb/glxsb_hash.c optional glxsb
@@ -43,7 +51,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -202,7 +173,6 @@
+@@ -213,7 +184,6 @@ dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
dev/nfe/if_nfe.c optional nfe pci
@@ -53,7 +61,7 @@
dev/random/nehemiah.c optional random
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -142,8 +142,6 @@
+@@ -146,8 +146,6 @@ device arcmsr # Areca SATA II RAID
device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -64,7 +72,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -97,8 +97,6 @@
+@@ -103,8 +103,6 @@ SUBDIR= ${_3dfx} \
hifn \
hme \
${_hptiop} \
@@ -73,7 +81,7 @@
hwpmc \
${_i2c} \
${_ibcs2} \
-@@ -203,7 +201,6 @@
+@@ -216,7 +214,6 @@ SUBDIR= ${_3dfx} \
ntfs \
ntfs_iconv \
nullfs \
@@ -81,7 +89,7 @@
${_nvram} \
${_nwfs} \
${_nxge} \
-@@ -424,8 +421,6 @@
+@@ -469,8 +466,6 @@ _ctau= ctau
_dpt= dpt
_ex= ex
_hptiop= hptiop
@@ -90,15 +98,15 @@
_ichwd= ichwd
_ida= ida
_iir= iir
-@@ -440,7 +435,6 @@
- _ixgb= ixgb
+@@ -486,7 +481,6 @@ _ixgb= ixgb
+ _ixgbe= ixgbe
_mly= mly
_nfe= nfe
-_nve= nve
_nvram= nvram
_nxge= nxge
- _wpi= wpi
-@@ -489,8 +483,6 @@
+ _tpm= tpm
+@@ -540,8 +534,6 @@ _em= em
_exca= exca
_ext2fs= ext2fs
_hptiop= hptiop
@@ -107,7 +115,7 @@
_i2c= i2c
_ichwd= ichwd
_ida= ida
-@@ -511,7 +503,6 @@
+@@ -566,7 +558,6 @@ _linux= linux
_mly= mly
_ndis= ndis
_nfe= nfe
@@ -117,7 +125,7 @@
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -135,8 +135,6 @@
+@@ -139,8 +139,6 @@ device arcmsr # Areca SATA II RAID
#device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID
device ciss # Compaq Smart RAID 5*
device dpt # DPT Smartcache III, IV - See NOTES for options
@@ -128,7 +136,7 @@
device mly # Mylex AcceleRAID/eXtremeRAID
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
-@@ -47,26 +47,6 @@
+@@ -47,26 +47,6 @@ ukbdmap.h optional ukbd_dflt_keymap \
no-obj no-implicit-rule before-depend \
clean "ukbdmap.h"
#
@@ -155,7 +163,7 @@
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
amd64/acpica/acpi_switch.S optional acpi
-@@ -190,14 +170,6 @@
+@@ -194,14 +174,6 @@ dev/fdc/fdc.c optional fdc
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
dev/fdc/fdc_pccard.c optional fdc pccard
@@ -170,8 +178,8 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_intel.c optional hwpmc
dev/hwpmc/hwpmc_core.c optional hwpmc
-@@ -207,7 +179,6 @@
- dev/kbd/kbd.c optional atkbd | sc | ukbd | usb2_input_kbd
+@@ -214,7 +186,6 @@ dev/lindev/full.c optional lindev
+ dev/lindev/lindev.c optional lindev
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
-dev/nve/if_nve.c optional nve pci
Modified: trunk/kfreebsd-8/debian/patches/904_dev_full.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/904_dev_full.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -2,10 +2,13 @@
Status: FIONBIO/FIOASYNC is in http://www.freebsd.org/cgi/query-pr.cgi?pr=138526
/dev/full already rejected in upstream (kern/68961)
-diff -ur a/sys/dev/null/null.c b/sys/dev/null/null.c
---- a/sys/dev/null/null.c 2010-08-06 11:47:48.000000000 +0200
-+++ b/sys/dev/null/null.c 2010-11-09 00:41:11.000000000 +0100
-@@ -43,9 +43,11 @@
+---
+ sys/dev/null/null.c | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+--- a/sys/dev/null/null.c
++++ b/sys/dev/null/null.c
+@@ -43,9 +43,11 @@ __FBSDID("$FreeBSD$");
/* For use with destroy_dev(9). */
static struct cdev *null_dev;
@@ -17,7 +20,7 @@
static d_ioctl_t null_ioctl;
static d_read_t zero_read;
-@@ -57,6 +59,14 @@
+@@ -57,6 +59,14 @@ static struct cdevsw null_cdevsw = {
.d_name = "null",
};
@@ -32,7 +35,7 @@
static struct cdevsw zero_cdevsw = {
.d_version = D_VERSION,
.d_read = zero_read,
-@@ -78,11 +88,25 @@
+@@ -78,11 +88,25 @@ null_write(struct cdev *dev __unused, st
/* ARGSUSED */
static int
@@ -58,7 +61,7 @@
if (cmd != DIOCSKERNELDUMP)
return (ENOIOCTL);
error = priv_check(td, PRIV_SETDUMPER);
-@@ -114,12 +138,15 @@
+@@ -114,12 +138,15 @@ null_modevent(module_t mod __unused, int
zbuf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK | M_ZERO);
null_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &null_cdevsw, 0,
NULL, UID_ROOT, GID_WHEEL, 0666, "null");
Modified: trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/906_grow_sysv_ipc_limits.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -21,9 +21,14 @@
You might also want to configure your kernel to lock shared memory into RAM and prevent it from being paged out to swap. Use the sysctl setting kern.ipc.shm_use_phys.
</quote>
+---
+ sys/amd64/conf/GENERIC | 6 ++++++
+ sys/i386/conf/GENERIC | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
-@@ -63,8 +63,14 @@
+@@ -63,8 +63,14 @@ options SCSI_DELAY=5000 # Delay (in ms
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
@@ -40,7 +45,7 @@
options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed.
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
-@@ -64,8 +64,14 @@
+@@ -64,8 +64,14 @@ options SCSI_DELAY=5000 # Delay (in ms
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
Modified: trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/907_cpu_class.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/907_cpu_class.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,9 +1,14 @@
Status: Rejected in upstream (kern/77355).
+---
+ sys/amd64/amd64/identcpu.c | 2 +-
+ sys/i386/i386/identcpu.c | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
-@@ -634,6 +634,7 @@
+@@ -634,6 +634,7 @@ printcpuinfo(void)
#if defined(I486_CPU)
case CPUCLASS_486:
printf("486");
@@ -11,7 +16,7 @@
break;
#endif
#if defined(I586_CPU)
-@@ -643,6 +644,7 @@
+@@ -643,6 +644,7 @@ printcpuinfo(void)
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("586");
@@ -19,7 +24,7 @@
break;
#endif
#if defined(I686_CPU)
-@@ -652,6 +654,7 @@
+@@ -652,6 +654,7 @@ printcpuinfo(void)
(intmax_t)(tsc_freq + 4999) / 1000000,
(u_int)((tsc_freq + 4999) / 10000) % 100);
printf("686");
@@ -29,7 +34,7 @@
default:
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ static int
sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
{
#ifdef SCTL_MASK32
Modified: trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/908_linprocfs_is_not_proc.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/compat/linprocfs/linprocfs.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -351,10 +351,6 @@
+@@ -358,10 +358,6 @@ linprocfs_domtab(PFS_FILL_ARGS)
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
Modified: trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/910_GENERIC_hints.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,11 @@
+---
+ sys/amd64/conf/GENERIC.hints | 1 +
+ sys/i386/conf/GENERIC.hints | 1 +
+ 2 files changed, 2 insertions(+)
+
--- a/sys/i386/conf/GENERIC.hints
+++ b/sys/i386/conf/GENERIC.hints
-@@ -18,6 +18,7 @@
+@@ -18,6 +18,7 @@ hint.atkbdc.0.port="0x060"
hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
@@ -10,7 +15,7 @@
hint.sc.0.flags="0x100"
--- a/sys/amd64/conf/GENERIC.hints
+++ b/sys/amd64/conf/GENERIC.hints
-@@ -12,6 +12,7 @@
+@@ -12,6 +12,7 @@ hint.atkbdc.0.port="0x060"
hint.atkbd.0.at="atkbdc"
hint.atkbd.0.irq="1"
hint.psm.0.at="atkbdc"
Modified: trunk/kfreebsd-8/debian/patches/912_binutils.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/912_binutils.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/912_binutils.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,7 @@
+---
+ sys/conf/ldscript.amd64 | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -1,12 +1,12 @@
@@ -15,7 +19,7 @@
.interp : { *(.interp) }
.hash : { *(.hash) }
.dynsym : { *(.dynsym) }
-@@ -61,7 +61,8 @@
+@@ -61,7 +61,8 @@ SECTIONS
.eh_frame_hdr : { *(.eh_frame_hdr) }
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
Modified: trunk/kfreebsd-8/debian/patches/913_uudecode.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/913_uudecode.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,20 @@
+---
+ sys/modules/ipwfw/ipw_bss/Makefile | 2 +-
+ sys/modules/ipwfw/ipw_ibss/Makefile | 2 +-
+ sys/modules/ipwfw/ipw_monitor/Makefile | 2 +-
+ sys/modules/iwifw/iwi_bss/Makefile | 2 +-
+ sys/modules/iwifw/iwi_ibss/Makefile | 2 +-
+ sys/modules/iwifw/iwi_monitor/Makefile | 2 +-
+ sys/modules/iwnfw/Makefile.inc | 2 +-
+ sys/modules/mwlfw/Makefile | 4 ++--
+ sys/modules/ralfw/Makefile.inc | 2 +-
+ sys/modules/runfw/Makefile | 2 +-
+ sys/modules/wpifw/Makefile | 2 +-
+ 11 files changed, 12 insertions(+), 12 deletions(-)
+
--- a/sys/modules/ralfw/Makefile.inc
+++ b/sys/modules/ralfw/Makefile.inc
-@@ -12,4 +12,4 @@
+@@ -12,4 +12,4 @@ CLEANFILES+= ${_FIRM}
FIRMWS= ${_FIRM}:${KMOD}
${_FIRM}: ${.CURDIR}/../../../contrib/dev/ral/${_FIRM}.uu
@@ -8,7 +22,7 @@
+ uudecode -o- $? > ${.TARGET}
--- a/sys/modules/mwlfw/Makefile
+++ b/sys/modules/mwlfw/Makefile
-@@ -6,9 +6,9 @@
+@@ -6,9 +6,9 @@ FIRMWS= mw88W8363.fw:mw88W8363fw mwlboot
CLEANFILES+= mw88W8363.fw mwlboot.fw
mw88W8363.fw: ${.CURDIR}/../../contrib/dev/mwl/mw88W8363.fw.uu
@@ -22,7 +36,7 @@
.include <bsd.kmod.mk>
--- a/sys/modules/ipwfw/ipw_bss/Makefile
+++ b/sys/modules/ipwfw/ipw_bss/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
CLEANFILES= ipw_bss
ipw_bss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu
@@ -33,7 +47,7 @@
--- a/sys/modules/ipwfw/ipw_ibss/Makefile
+++ b/sys/modules/ipwfw/ipw_ibss/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
CLEANFILES= ipw_ibss
ipw_ibss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu
@@ -44,7 +58,7 @@
--- a/sys/modules/ipwfw/ipw_monitor/Makefile
+++ b/sys/modules/ipwfw/ipw_monitor/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_ipw
CLEANFILES= ipw_monitor
ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
@@ -55,7 +69,7 @@
--- a/sys/modules/iwifw/iwi_bss/Makefile
+++ b/sys/modules/iwifw/iwi_bss/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
CLEANFILES= iwi_bss
iwi_bss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu
@@ -66,7 +80,7 @@
--- a/sys/modules/iwifw/iwi_ibss/Makefile
+++ b/sys/modules/iwifw/iwi_ibss/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
CLEANFILES= iwi_fw
iwi_ibss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu
@@ -77,7 +91,7 @@
--- a/sys/modules/iwifw/iwi_monitor/Makefile
+++ b/sys/modules/iwifw/iwi_monitor/Makefile
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ FIRMWARE_LICENSE= intel_iwi
CLEANFILES= iwi_monitor
iwi_monitor: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu
@@ -88,7 +102,7 @@
--- a/sys/modules/wpifw/Makefile
+++ b/sys/modules/wpifw/Makefile
-@@ -8,6 +8,6 @@
+@@ -8,6 +8,6 @@ FIRMWS= iwlwifi-3945-2.14.4.fw:wpifw:214
CLEANFILES= iwlwifi-3945-2.14.4.fw
iwlwifi-3945-2.14.4.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu
@@ -98,7 +112,7 @@
.include <bsd.kmod.mk>
--- a/sys/modules/iwnfw/Makefile.inc
+++ b/sys/modules/iwnfw/Makefile.inc
-@@ -10,4 +10,4 @@
+@@ -10,4 +10,4 @@ CLEANFILES+= ${_FIRM}
FIRMWS= ${_FIRM}:${KMOD}
${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu
@@ -106,7 +120,7 @@
+ uudecode -o- $? > ${.TARGET}
--- a/sys/modules/runfw/Makefile
+++ b/sys/modules/runfw/Makefile
-@@ -6,6 +6,6 @@
+@@ -6,6 +6,6 @@ FIRMWS= runfw:runfw:1
CLEANFILES= runfw
runfw: ${.CURDIR}/../../contrib/dev/run/rt2870.fw.uu
Modified: trunk/kfreebsd-8/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/914_psm.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/914_psm.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,9 +5,13 @@
|
| This makes Xorg happy if you aren't using moused.
+---
+ sys/dev/atkbdc/psm.c | 23 -----------------------
+ 1 file changed, 23 deletions(-)
+
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
-@@ -70,10 +70,7 @@
+@@ -70,10 +70,7 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/bus.h>
#include <sys/conf.h>
@@ -18,7 +22,7 @@
#include <sys/syslog.h>
#include <machine/bus.h>
#include <sys/rman.h>
-@@ -302,7 +299,6 @@
+@@ -302,7 +299,6 @@ struct psm_softc { /* Driver status inf
struct cdev *bdev;
int lasterr;
int cmdcount;
@@ -26,7 +30,7 @@
};
static devclass_t psm_devclass;
#define PSM_SOFTC(unit) \
-@@ -1494,7 +1490,6 @@
+@@ -1494,7 +1490,6 @@ psmopen(struct cdev *dev, int flag, int
sc->mode.level = sc->dflt_mode.level;
sc->mode.protocol = sc->dflt_mode.protocol;
sc->watchdog = FALSE;
@@ -34,7 +38,7 @@
/* flush the event queue */
sc->queue.count = 0;
-@@ -1634,12 +1629,6 @@
+@@ -1634,12 +1629,6 @@ psmclose(struct cdev *dev, int flag, int
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -47,7 +51,7 @@
/* close is almost always successful */
sc->state &= ~PSM_OPEN;
kbdc_lock(sc->kbdc, FALSE);
-@@ -2201,15 +2190,6 @@
+@@ -2201,15 +2190,6 @@ psmioctl(struct cdev *dev, u_long cmd, c
break;
#endif /* MOUSE_GETHWID */
@@ -63,7 +67,7 @@
default:
return (ENOTTY);
}
-@@ -3474,9 +3454,6 @@
+@@ -3474,9 +3454,6 @@ next:
wakeup(sc);
}
selwakeuppri(&sc->rsel, PZERO);
Modified: trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/915_ip6.v6only.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/netinet6/in6_proto.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -393,7 +393,7 @@
+@@ -393,7 +393,7 @@ VNET_DEFINE(int, ip6_forwarding) = IPV6F
VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -9,7 +13,7 @@
VNET_DEFINE(int, ip6_maxfragpackets); /* initialized in frag6.c:frag6_init() */
VNET_DEFINE(int, ip6_maxfrags); /* initialized in frag6.c:frag6_init() */
VNET_DEFINE(int, ip6_log_interval) = 5;
-@@ -406,7 +406,7 @@
+@@ -406,7 +406,7 @@ VNET_DEFINE(int, ip6_use_deprecated) = 1
VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix
* walk list every 5 sec. */
VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */
Modified: trunk/kfreebsd-8/debian/patches/916_NKPT_amd64.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/916_NKPT_amd64.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/916_NKPT_amd64.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
See #596577
+---
+ sys/amd64/include/pmap.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -115,7 +115,7 @@
Modified: trunk/kfreebsd-8/debian/patches/917_track_alignment.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/917_track_alignment.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/917_track_alignment.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,6 +1,10 @@
+---
+ sys/geom/part/g_part_mbr.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
-@@ -416,13 +416,6 @@
+@@ -449,13 +449,6 @@ g_part_mbr_read(struct g_part_table *bas
basetable->gpt_heads = heads;
}
}
Modified: trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/950_no_stack_protector.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -6,9 +6,14 @@
- different init order
- ...
+---
+ sys/conf/kern.mk | 2 ++
+ sys/conf/kmod.mk | 3 +++
+ 2 files changed, 5 insertions(+)
+
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
-@@ -111,6 +111,8 @@
+@@ -123,6 +123,8 @@ CFLAGS+= -restrict
#
# GCC SSP support.
#
@@ -19,8 +24,8 @@
CFLAGS+= -fstack-protector
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
-@@ -128,6 +128,9 @@
- CFLAGS+= -mlongcall -fno-omit-frame-pointer
+@@ -132,6 +132,9 @@ CFLAGS+= -mlongcall -fno-omit-frame-poin
+ CFLAGS+= -G0 -fno-pic -mno-abicalls -mlong-calls
.endif
+# Disable stack protector as it causes kernel panic
Modified: trunk/kfreebsd-8/debian/patches/999_config.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_config.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/999_config.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,3 +1,8 @@
+---
+ sys/amd64/conf/GENERIC | 43 ++++++++++++++++---------------------------
+ sys/i386/conf/GENERIC | 49 ++++++++++++++++++++-----------------------------
+ 2 files changed, 36 insertions(+), 56 deletions(-)
+
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -18,11 +18,11 @@
@@ -15,7 +20,7 @@
# Use the following to compile in values accessible to the kernel
# through getenv() (or kenv(1) in userland). The format of the file
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ ident GENERIC
#
# env "GENERIC.env"
@@ -24,7 +29,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ options COMPAT_FREEBSD4 # Compatible w
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -33,8 +38,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -84,7 +84,7 @@
- options INCLUDE_CONFIG_FILE # Include this file in kernel
+@@ -87,7 +87,7 @@ options KDB # Kernel debugger related
+ options KDB_TRACE # Print a stack trace for a panic
# Make an SMP-capable kernel by default
-options SMP # Symmetric MultiProcessor Kernel
@@ -42,7 +47,7 @@
# CPU frequency control
device cpufreq
-@@ -93,9 +93,6 @@
+@@ -96,9 +96,6 @@ device cpufreq
device acpi
device pci
@@ -52,7 +57,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -103,6 +100,8 @@
+@@ -106,6 +103,8 @@ device ataraid # ATA RAID drives
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -61,7 +66,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -122,7 +121,6 @@
+@@ -125,7 +124,6 @@ device sym # NCR/Symbios Logic (newer
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -69,7 +74,7 @@
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -185,10 +183,6 @@
+@@ -188,10 +186,6 @@ device uart # Generic UART driver
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -80,7 +85,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -201,8 +195,6 @@
+@@ -204,8 +198,6 @@ device em # Intel PRO/1000 Gigabit Eth
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgbe # Intel PRO/10GbE PCIE Ethernet Family
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -89,7 +94,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -212,12 +204,10 @@
+@@ -215,12 +207,10 @@ device ae # Attansic/Atheros L2 FastEt
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -102,7 +107,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -227,7 +217,6 @@
+@@ -230,7 +220,6 @@ device nge # NatSemi DP83820 gigabit E
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -110,7 +115,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -247,7 +236,6 @@
+@@ -250,7 +239,6 @@ device ed # NE[12]000, SMC Ultra, 3c50
device ex # Intel EtherExpress Pro/10 and Pro/10+
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
@@ -118,7 +123,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -272,11 +260,8 @@
+@@ -275,11 +263,8 @@ device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -130,7 +135,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -296,7 +281,6 @@
+@@ -299,7 +284,6 @@ device ukbd # Keyboard
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
@@ -138,7 +143,7 @@
# USB Serial devices
device uark # Technologies ARK3116 based serial adapters
device ubsa # Belkin F5U103 and compatible serial adapters
-@@ -315,10 +299,7 @@
+@@ -318,10 +302,7 @@ device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
device udav # Davicom DM9601E USB
# USB Wireless
@@ -149,7 +154,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -327,3 +308,11 @@
+@@ -330,3 +311,11 @@ device fwe # Ethernet over FireWire (n
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
@@ -182,7 +187,7 @@
# Use the following to compile in values accessible to the kernel
# through getenv() (or kenv(1) in userland). The format of the file
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ ident GENERIC
#
# env "GENERIC.env"
@@ -191,7 +196,7 @@
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
-@@ -52,6 +52,8 @@
+@@ -52,6 +52,8 @@ options NFS_ROOT # NFS usable as /, re
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
options PROCFS # Process filesystem (requires PSEUDOFS)
@@ -200,7 +205,7 @@
options PSEUDOFS # Pseudo-filesystem framework
options GEOM_PART_GPT # GUID Partition Tables.
options GEOM_LABEL # Provides labelization
-@@ -60,7 +62,7 @@
+@@ -60,7 +62,7 @@ options COMPAT_FREEBSD4 # Compatible w
options COMPAT_FREEBSD5 # Compatible with FreeBSD5
options COMPAT_FREEBSD6 # Compatible with FreeBSD6
options COMPAT_FREEBSD7 # Compatible with FreeBSD7
@@ -209,8 +214,8 @@
options KTRACE # ktrace(1) support
options STACK # stack(9) support
options SYSVSHM # SYSV-style shared memory
-@@ -84,7 +86,7 @@
- options INCLUDE_CONFIG_FILE # Include this file in kernel
+@@ -87,7 +89,7 @@ options KDB # Kernel debugger related
+ options KDB_TRACE # Print a stack trace for a panic
# To make an SMP kernel, the next two lines are needed
-options SMP # Symmetric MultiProcessor Kernel
@@ -218,7 +223,7 @@
device apic # I/O APIC
# CPU frequency control
-@@ -95,9 +97,6 @@
+@@ -98,9 +100,6 @@ device acpi
device eisa
device pci
@@ -228,7 +233,7 @@
# ATA and ATAPI devices
device ata
device atadisk # ATA disk drives
-@@ -105,6 +104,8 @@
+@@ -108,6 +107,8 @@ device ataraid # ATA RAID drives
device atapicd # ATAPI CDROM drives
device atapifd # ATAPI floppy drives
device atapist # ATAPI tape drives
@@ -237,7 +242,7 @@
options ATA_STATIC_ID # Static device numbering
# SCSI Controllers
-@@ -125,7 +126,6 @@
+@@ -128,7 +129,6 @@ device sym # NCR/Symbios Logic (newer
device trm # Tekram DC395U/UW/F DC315U adapters
device adv # Advansys SCSI adapters
@@ -245,7 +250,7 @@
device aha # Adaptec 154x SCSI adapters
device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device bt # Buslogic/Mylex MultiMaster SCSI adapters
-@@ -196,10 +196,6 @@
+@@ -199,10 +199,6 @@ device uart # Generic UART driver
# Parallel port
device ppc
device ppbus # Parallel port bus (required)
@@ -256,7 +261,7 @@
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-@@ -212,8 +208,6 @@
+@@ -215,8 +211,6 @@ device em # Intel PRO/1000 Gigabit Eth
device igb # Intel PRO/1000 PCIE Server Gigabit Family
device ixgb # Intel PRO/10GbE Ethernet Card
device le # AMD Am7900 LANCE and Am79C9xx PCnet
@@ -265,7 +270,7 @@
device vx # 3Com 3c590, 3c595 (``Vortex'')
# PCI Ethernet NICs that use the common MII bus controller code.
-@@ -223,12 +217,10 @@
+@@ -226,12 +220,10 @@ device ae # Attansic/Atheros L2 FastEt
device age # Attansic/Atheros L1 Gigabit Ethernet
device alc # Atheros AR8131/AR8132 Ethernet
device ale # Atheros AR8121/AR8113/AR8114 Ethernet
@@ -278,7 +283,7 @@
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
-@@ -238,7 +230,6 @@
+@@ -241,7 +233,6 @@ device nge # NatSemi DP83820 gigabit E
device pcn # AMD Am79C97x PCI 10/100 (precedence over 'le')
device re # RealTek 8139C+/8169/8169S/8110S
device rl # RealTek 8129/8139
@@ -286,7 +291,7 @@
device sge # Silicon Integrated Systems SiS190/191
device sis # Silicon Integrated Systems SiS 900/SiS 7016
device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
-@@ -259,7 +250,6 @@
+@@ -262,7 +253,6 @@ device ex # Intel EtherExpress Pro/10
device ep # Etherlink III based cards
device fe # Fujitsu MB8696x based cards
device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc.
@@ -294,7 +299,7 @@
device xe # Xircom pccard Ethernet
# Wireless NIC cards
-@@ -285,11 +275,8 @@
+@@ -288,11 +278,8 @@ device loop # Network loopback
device random # Entropy device
device ether # Ethernet support
device vlan # 802.1Q VLAN support
@@ -306,7 +311,7 @@
device firmware # firmware assist module
# The `bpf' device enables the Berkeley Packet Filter.
-@@ -309,7 +296,6 @@
+@@ -312,7 +299,6 @@ device ukbd # Keyboard
device ulpt # Printer
device umass # Disks/Mass storage - Requires scbus and da
device ums # Mouse
@@ -314,7 +319,7 @@
# USB Serial devices
device u3g # USB-based 3G modems (Option, Huawei, Sierra)
device uark # Technologies ARK3116 based serial adapters
-@@ -329,10 +315,7 @@
+@@ -332,10 +318,7 @@ device kue # Kawasaki LSI USB Ethernet
device rue # RealTek RTL8150 USB Ethernet
device udav # Davicom DM9601E USB
# USB Wireless
@@ -325,7 +330,7 @@
# FireWire support
device firewire # FireWire bus code
-@@ -341,3 +324,11 @@
+@@ -344,3 +327,11 @@ device fwe # Ethernet over FireWire (n
device fwip # IP over FireWire (RFC 2734,3146)
device dcons # Dumb console driver
device dcons_crom # Configuration ROM for dcons
Modified: trunk/kfreebsd-8/debian/patches/999_firmware.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/999_firmware.diff 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/patches/999_firmware.diff 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,9 +1,18 @@
See #594940
+---
+ sys/conf/files | 333 --------------------------------------
+ sys/conf/files.i386 | 8
+ sys/modules/Makefile | 29 ---
+ sys/modules/drm/Makefile | 3
+ sys/modules/sound/driver/Makefile | 4
+ sys/modules/usb/Makefile | 4
+ 6 files changed, 4 insertions(+), 377 deletions(-)
+
--- a/sys/conf/files
+++ b/sys/conf/files
-@@ -462,10 +462,6 @@
+@@ -462,10 +462,6 @@ dev/advansys/adv_pci.c optional adv pci
dev/advansys/advansys.c optional adv
dev/advansys/advlib.c optional adv
dev/advansys/advmcode.c optional adv
@@ -14,7 +23,7 @@
dev/ae/if_ae.c optional ae pci
dev/age/if_age.c optional age pci inet
dev/agp/agp.c optional agp pci
-@@ -758,7 +754,6 @@
+@@ -758,7 +754,6 @@ dev/ath/ath_rate/onoe/onoe.c optional at
dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
compile-with "${NORMAL_C} -I$S/dev/ath"
#
@@ -22,7 +31,7 @@
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
dev/bktr/bktr_audio.c optional bktr pci
-@@ -794,34 +789,6 @@
+@@ -794,34 +789,6 @@ dev/cpufreq/ichss.c optional cpufreq
dev/cs/if_cs.c optional cs
dev/cs/if_cs_isa.c optional cs isa
dev/cs/if_cs_pccard.c optional cs pccard
@@ -57,7 +66,7 @@
dev/cy/cy.c optional cy
dev/cy/cy_isa.c optional cy isa
dev/cy/cy_pci.c optional cy pci
-@@ -832,13 +799,6 @@
+@@ -832,13 +799,6 @@ dev/dcons/dcons.c optional dcons
dev/dcons/dcons_crom.c optional dcons_crom
dev/dcons/dcons_os.c optional dcons
dev/de/if_de.c optional de pci
@@ -71,7 +80,7 @@
dev/digi/digi.c optional digi
dev/digi/digi_isa.c optional digi isa
dev/digi/digi_pci.c optional digi pci
-@@ -871,26 +831,6 @@
+@@ -871,26 +831,6 @@ dev/drm/mach64_dma.c optional mach64drm
dev/drm/mach64_drv.c optional mach64drm
dev/drm/mach64_irq.c optional mach64drm
dev/drm/mach64_state.c optional mach64drm
@@ -98,7 +107,7 @@
dev/drm/savage_bci.c optional savagedrm
dev/drm/savage_drv.c optional savagedrm
dev/drm/savage_state.c optional savagedrm
-@@ -972,7 +912,6 @@
+@@ -972,7 +912,6 @@ dev/firewire/if_fwip.c optional fwip
dev/firewire/sbp.c optional sbp
dev/firewire/sbp_targ.c optional sbp_targ
dev/flash/at45d.c optional at45d
@@ -106,7 +115,7 @@
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
dev/gem/if_gem_sbus.c optional gem sbus
-@@ -1022,48 +961,6 @@
+@@ -1022,48 +961,6 @@ dev/ips/ips_disk.c optional ips
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
@@ -155,7 +164,7 @@
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
-@@ -1076,135 +973,7 @@
+@@ -1076,135 +973,7 @@ dev/isp/isp_library.c optional isp
dev/isp/isp_pci.c optional isp pci
dev/isp/isp_sbus.c optional isp sbus
dev/isp/isp_target.c optional isp
@@ -291,7 +300,7 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
-@@ -1315,30 +1084,6 @@
+@@ -1315,30 +1084,6 @@ dev/mvs/mvs_pci.c optional mvs pci
dev/mwl/if_mwl.c optional mwl
dev/mwl/if_mwl_pci.c optional mwl pci
dev/mwl/mwlhal.c optional mwl
@@ -322,7 +331,7 @@
dev/mxge/if_mxge.c optional mxge pci
dev/mxge/mxge_lro.c optional mxge pci
dev/mxge/mxge_eth_z8e.c optional mxge pci
-@@ -1429,62 +1174,6 @@
+@@ -1429,62 +1174,6 @@ dev/quicc/quicc_core.c optional quicc
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
@@ -385,7 +394,7 @@
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
-@@ -1509,14 +1198,7 @@
+@@ -1509,14 +1198,7 @@ dev/scc/scc_dev_z8530.c optional scc
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/sdhci/sdhci.c optional sdhci pci
@@ -400,7 +409,7 @@
dev/siba/siba_bwn.c optional siba_bwn pci
dev/siba/siba_core.c optional siba_bwn pci
dev/siis/siis.c optional siis pci
-@@ -1527,9 +1209,6 @@
+@@ -1527,9 +1209,6 @@ dev/smbus/smbconf.c optional smbus
dev/smbus/smbus.c optional smbus
dev/smbus/smbus_if.m optional smbus
dev/smc/if_smc.c optional smc
@@ -410,7 +419,7 @@
dev/snp/snp.c optional snp
dev/sound/clone.c optional sound
dev/sound/unit.c optional sound
-@@ -1545,10 +1224,6 @@
+@@ -1545,10 +1224,6 @@ dev/sound/pci/als4000.c optional snd_al
dev/sound/pci/atiixp.c optional snd_atiixp pci
dev/sound/pci/cmi.c optional snd_cmi pci
dev/sound/pci/cs4281.c optional snd_cs4281 pci
@@ -421,7 +430,7 @@
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \
dependency "emu10k1-alsa%diked.h" \
warning "kernel contains GPL contaminated emu10k1 headers"
-@@ -1571,8 +1246,6 @@
+@@ -1571,8 +1246,6 @@ dev/sound/pci/es137x.c optional snd_es1
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
dev/sound/pci/maestro.c optional snd_maestro pci
@@ -430,7 +439,7 @@
dev/sound/pci/neomagic.c optional snd_neomagic pci
dev/sound/pci/solo.c optional snd_solo pci
dev/sound/pci/spicds.c optional snd_spicds pci
-@@ -1652,7 +1325,6 @@
+@@ -1652,7 +1325,6 @@ dev/syscons/sysmouse.c optional sc
dev/syscons/warp/warp_saver.c optional warp_saver
dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux
dev/tdfx/tdfx_pci.c optional tdfx pci
@@ -438,7 +447,7 @@
dev/tl/if_tl.c optional tl pci
dev/trm/trm.c optional trm
dev/twa/tw_cl_init.c optional twa \
-@@ -1670,7 +1342,6 @@
+@@ -1670,7 +1342,6 @@ dev/twa/tw_osl_freebsd.c optional twa \
dev/twe/twe.c optional twe
dev/twe/twe_freebsd.c optional twe
dev/tx/if_tx.c optional tx
@@ -446,7 +455,7 @@
dev/uart/uart_bus_acpi.c optional uart acpi
#dev/uart/uart_bus_cbus.c optional uart cbus
dev/uart/uart_bus_ebus.c optional uart ebus
-@@ -1748,7 +1419,6 @@
+@@ -1748,7 +1419,6 @@ dev/usb/net/if_axe.c optional axe
dev/usb/net/if_cdce.c optional cdce
dev/usb/net/if_cue.c optional cue
dev/usb/net/if_ipheth.c optional ipheth
@@ -454,7 +463,7 @@
dev/usb/net/if_rue.c optional rue
dev/usb/net/if_udav.c optional udav
dev/usb/net/usb_ethernet.c optional aue | axe | cdce | cue | kue | rue | \
-@@ -1757,13 +1427,10 @@
+@@ -1757,13 +1427,10 @@ dev/usb/net/uhso.c optional uhso
#
# USB WLAN drivers
#
@@ -470,7 +479,7 @@
#
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
-@@ -120,17 +120,9 @@
+@@ -120,17 +120,9 @@ dev/atkbdc/atkbdc.c optional atkbdc
dev/atkbdc/atkbdc_isa.c optional atkbdc isa
dev/atkbdc/atkbdc_subr.c optional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
@@ -490,7 +499,7 @@
dev/cx/if_cx.c optional cx
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
-@@ -4,9 +4,6 @@
+@@ -4,9 +4,6 @@ SUBDIR = \
drm \
i915 \
mach64 \
@@ -502,7 +511,7 @@
tdfx
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -36,7 +36,6 @@
+@@ -36,7 +36,6 @@ SUBDIR= ${_3dfx} \
ata \
ath \
${_auxio} \
@@ -510,7 +519,7 @@
bfe \
bge \
${_bios} \
-@@ -53,7 +52,6 @@
+@@ -53,7 +52,6 @@ SUBDIR= ${_3dfx} \
${_cbb} \
cd9660 \
cd9660_iconv \
@@ -518,7 +527,7 @@
${_ciss} \
${_cm} \
${_cmx} \
-@@ -61,14 +59,11 @@
+@@ -61,14 +59,11 @@ SUBDIR= ${_3dfx} \
coda5 \
${_coff} \
${_coretemp} \
@@ -533,7 +542,7 @@
${_cyclic} \
dc \
dcons \
-@@ -89,13 +84,11 @@
+@@ -89,13 +84,11 @@ SUBDIR= ${_3dfx} \
${_ex} \
${_exca} \
${_ext2fs} \
@@ -547,7 +556,7 @@
gem \
geom \
${_glxsb} \
-@@ -135,14 +128,10 @@
+@@ -135,14 +128,10 @@ SUBDIR= ${_3dfx} \
ip_mroute_mod \
${_ips} \
${_ipw} \
@@ -562,7 +571,7 @@
${_ixgb} \
${_ixgbe} \
jme \
-@@ -191,7 +180,6 @@
+@@ -191,7 +180,6 @@ SUBDIR= ${_3dfx} \
msk \
mvs \
mwl \
@@ -570,7 +579,7 @@
mxge \
my \
${_ncp} \
-@@ -237,14 +225,12 @@
+@@ -237,14 +225,12 @@ SUBDIR= ${_3dfx} \
${_pst} \
puc \
ral \
@@ -585,7 +594,7 @@
${_s3} \
${_safe} \
${_sbni} \
-@@ -253,7 +239,6 @@
+@@ -253,7 +239,6 @@ SUBDIR= ${_3dfx} \
${_scsi_low} \
sdhci \
sem \
@@ -593,7 +602,7 @@
sge \
${_siba_bwn} \
siftr \
-@@ -261,7 +246,6 @@
+@@ -261,7 +246,6 @@ SUBDIR= ${_3dfx} \
sis \
sk \
${_smbfs} \
@@ -601,7 +610,7 @@
${_snc} \
snp \
${_sound} \
-@@ -276,7 +260,6 @@
+@@ -276,7 +260,6 @@ SUBDIR= ${_3dfx} \
${_sym} \
${_syscons} \
sysvipc \
@@ -609,7 +618,7 @@
tl \
${_tmpfs} \
${_tpm} \
-@@ -284,7 +267,6 @@
+@@ -284,7 +267,6 @@ SUBDIR= ${_3dfx} \
${_twa} \
twe \
tx \
@@ -617,7 +626,7 @@
${_uart} \
ubsec \
udf \
-@@ -310,7 +292,6 @@
+@@ -310,7 +292,6 @@ SUBDIR= ${_3dfx} \
wlan_wep \
wlan_xauth \
${_wpi} \
@@ -625,7 +634,7 @@
${_x86bios} \
${_xe} \
xfs \
-@@ -376,9 +357,7 @@
+@@ -378,9 +359,7 @@ _arcnet= arcnet
_bktr= bktr
_cardbus= cardbus
_cbb= cbb
@@ -635,7 +644,7 @@
_cpuctl= cpuctl
_cpufreq= cpufreq
_cs= cs
-@@ -470,11 +449,8 @@
+@@ -472,11 +451,8 @@ _iir= iir
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -647,7 +656,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_mly= mly
-@@ -483,7 +459,6 @@
+@@ -485,7 +461,6 @@ _nvram= nvram
_nxge= nxge
_tpm= tpm
_wpi= wpi
@@ -655,7 +664,7 @@
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
_padlock= padlock
.endif
-@@ -542,11 +517,8 @@
+@@ -544,11 +519,8 @@ _io= io
_ipmi= ipmi
_ips= ips
_ipw= ipw
@@ -667,7 +676,7 @@
_ixgb= ixgb
_ixgbe= ixgbe
_lindev= lindev
-@@ -581,7 +553,6 @@
+@@ -583,7 +555,6 @@ _vesa= vesa
_x86bios= x86bios
_wi= wi
_wpi= wpi
Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/kfreebsd-8/debian/rules 2011-05-26 02:53:11 UTC (rev 3329)
@@ -40,8 +40,6 @@
MAKE := make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-4.3 WERROR=
PATH := $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
-include /usr/share/quilt/quilt.make
-
get-orig-source:
rm -rf $(ORIG_DIR)
for i in sys usr.sbin/config ; do \
@@ -66,7 +64,7 @@
done ; \
done
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf src kfreebsd-source-* flavor-* config
@@ -80,8 +78,6 @@
src: src-stamp
src-stamp:
- QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
-
mkdir $(CURDIR)/src
cp -af $(CURDIR)/sys $(CURDIR)/usr.sbin $(CURDIR)/src
Added: trunk/kfreebsd-8/debian/source/format
===================================================================
--- trunk/kfreebsd-8/debian/source/format (rev 0)
+++ trunk/kfreebsd-8/debian/source/format 2011-05-26 02:53:11 UTC (rev 3329)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: trunk/ufsutils/debian/README.source
===================================================================
--- trunk/ufsutils/debian/README.source 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/README.source 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,57 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/changelog 2011-05-26 02:53:11 UTC (rev 3329)
@@ -5,6 +5,11 @@
[ Guillem Jover ]
* Now using Standards-Version 3.9.2 (no changes needed).
+ * Switch to source format “3.0 (quilt)”.
+ - Remove quilt from Build-Depends.
+ - Remove patch target in debian/rules.
+ - Remove now unneeded README.source.
+ - Refresh all patches.
-- Robert Millan <rmh at debian.org> Thu, 27 Jan 2011 16:22:17 +0100
Modified: trunk/ufsutils/debian/control
===================================================================
--- trunk/ufsutils/debian/control 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/control 2011-05-26 02:53:11 UTC (rev 3329)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 7), quilt, libedit-dev, libncurses5-dev, libbsd-dev, libc0.1-dev (>= 2.10.1) [kfreebsd-any]
+Build-Depends: debhelper (>= 7), libedit-dev, libncurses5-dev, libbsd-dev, libc0.1-dev (>= 2.10.1) [kfreebsd-any]
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/ufsutils/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/ufsutils/
Standards-Version: 3.9.2
Modified: trunk/ufsutils/debian/patches/00_include.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_include.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/00_include.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,10 @@
-Index: ufsutils/freebsd/sys/disklabel.h
-===================================================================
---- ufsutils.orig/freebsd/sys/disklabel.h
-+++ ufsutils/freebsd/sys/disklabel.h
+---
+ freebsd/sys/disklabel.h | 3 ++-
+ freebsd/sys/ucred.h | 2 ++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/freebsd/sys/disklabel.h
++++ b/freebsd/sys/disklabel.h
@@ -36,7 +36,8 @@
#ifndef _KERNEL
#include <sys/types.h>
@@ -12,10 +15,8 @@
/*
* Disk description table, see disktab(5)
-Index: ufsutils/freebsd/sys/ucred.h
-===================================================================
---- ufsutils.orig/freebsd/sys/ucred.h
-+++ ufsutils/freebsd/sys/ucred.h
+--- a/freebsd/sys/ucred.h
++++ b/freebsd/sys/ucred.h
@@ -33,7 +33,9 @@
#ifndef _SYS_UCRED_H_
#define _SYS_UCRED_H_
Modified: trunk/ufsutils/debian/patches/00_libport.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_libport.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/00_libport.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,12 @@
-Index: ufsutils/include/port/port.h
-===================================================================
+---
+ include/port/blockdev.h | 9 ++++
+ include/port/port.h | 22 +++++++++++
+ libport/Makefile | 13 ++++++
+ libport/blockdev.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 136 insertions(+)
+
--- /dev/null
-+++ ufsutils/include/port/port.h
++++ b/include/port/port.h
@@ -0,0 +1,22 @@
+#ifndef LIBPORT_H
+#define LIBPORT_H
@@ -25,10 +30,8 @@
+#endif
+
+#endif
-Index: ufsutils/libport/blockdev.c
-===================================================================
--- /dev/null
-+++ ufsutils/libport/blockdev.c
++++ b/libport/blockdev.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2004 Guillem Jover <guillem at debian.org>
@@ -122,10 +125,8 @@
+
+ return size;
+}
-Index: ufsutils/include/port/blockdev.h
-===================================================================
--- /dev/null
-+++ ufsutils/include/port/blockdev.h
++++ b/include/port/blockdev.h
@@ -0,0 +1,9 @@
+#ifndef LIBPORT_BLOCKDEV_H
+#define LIBPORT_BLOCKDEV_H
@@ -136,10 +137,8 @@
+
+#endif
+
-Index: ufsutils/libport/Makefile
-===================================================================
--- /dev/null
-+++ ufsutils/libport/Makefile
++++ b/libport/Makefile
@@ -0,0 +1,13 @@
+LIB = port
+LIB_type = static
Modified: trunk/ufsutils/debian/patches/00_mount.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_mount.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/00_mount.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,9 @@
-Index: ufsutils/freebsd/sys/mount.h
-===================================================================
---- ufsutils.orig/freebsd/sys/mount.h
-+++ ufsutils/freebsd/sys/mount.h
+---
+ freebsd/sys/mount.h | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+--- a/freebsd/sys/mount.h
++++ b/freebsd/sys/mount.h
@@ -34,20 +34,16 @@
#define _SYS_MOUNT_H_
@@ -27,7 +29,7 @@
/*
* File identifier.
* These are unique per filesystem on a single machine.
-@@ -65,6 +61,7 @@
+@@ -65,6 +61,7 @@ struct fid {
*/
#define MFSNAMELEN 16 /* length of type name including null */
#define MNAMELEN 88 /* size of on/from name bufs */
@@ -35,7 +37,7 @@
#define STATFS_VERSION 0x20030518 /* current version number */
struct statfs {
uint32_t f_version; /* structure version number */
-@@ -216,6 +213,7 @@
+@@ -224,6 +221,7 @@ void __mnt_vnode_markerfree(str
} while (0)
#endif /* _KERNEL */
@@ -43,7 +45,7 @@
/*
* User specifiable flags.
-@@ -391,6 +389,7 @@
+@@ -404,6 +402,7 @@ struct nfs_public {
char *np_index; /* Index file */
};
@@ -51,7 +53,7 @@
/*
* Filesystem configuration information. One of these exists for each
* type of filesystem supported by the kernel. These are searched at
-@@ -428,6 +427,7 @@
+@@ -441,6 +440,7 @@ struct ovfsconf {
int vfc_flags;
};
#endif
@@ -59,7 +61,7 @@
/*
* NB: these flags refer to IMPLEMENTATION properties, not properties of
-@@ -492,6 +492,7 @@
+@@ -505,6 +505,7 @@ struct vfsquery {
#define VQ_FLAG4000 0x4000 /* placeholder */
#define VQ_FLAG8000 0x8000 /* placeholder */
@@ -67,7 +69,7 @@
#ifdef _KERNEL
/* Point a sysctl request at a vfsidctl's data. */
#define VCTLTOREQ(vc, req) \
-@@ -753,5 +754,5 @@
+@@ -766,5 +767,5 @@ int getvfsbyname(const char *, struct xv
__END_DECLS
#endif /* _KERNEL */
Modified: trunk/ufsutils/debian/patches/00_param.patch
===================================================================
--- trunk/ufsutils/debian/patches/00_param.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/00_param.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,9 @@
-Index: ufsutils/freebsd/sys/param.h
-===================================================================
---- ufsutils.orig/freebsd/sys/param.h
-+++ ufsutils/freebsd/sys/param.h
+---
+ freebsd/sys/param.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/freebsd/sys/param.h
++++ b/freebsd/sys/param.h
@@ -38,6 +38,7 @@
#ifndef _SYS_PARAM_H_
#define _SYS_PARAM_H_
@@ -46,7 +48,7 @@
#define NBBY 8 /* number of bits in a byte */
#define NBPW sizeof(int) /* number of bytes per word (integer) */
-@@ -256,6 +264,7 @@
+@@ -258,6 +266,7 @@
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)>(b))?(a):(b))
@@ -54,9 +56,9 @@
#ifdef _KERNEL
/*
* Basic byte order function prototypes for non-inline functions.
-@@ -319,4 +328,5 @@
- #define __OpenSolaris_version 20060731
- #endif
+@@ -305,4 +314,5 @@ __END_DECLS
+ #define ctodb(db) /* calculates pages to devblks */ \
+ ((db) << (PAGE_SHIFT - DEV_BSHIFT))
+#endif
#endif /* _SYS_PARAM_H_ */
Modified: trunk/ufsutils/debian/patches/01_libdisklabel.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libdisklabel.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/01_libdisklabel.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,10 @@
-Index: ufsutils/libdisklabel/Makefile
-===================================================================
+---
+ libdisklabel/Makefile | 10 ++++++++++
+ libdisklabel/getdisklabel.c | 8 ++++++++
+ 2 files changed, 18 insertions(+)
+
--- /dev/null
-+++ ufsutils/libdisklabel/Makefile
++++ b/libdisklabel/Makefile
@@ -0,0 +1,10 @@
+LIB = disklabel
+LIB_type = static
@@ -13,10 +16,8 @@
+
+include ../Makefile.common
+
-Index: ufsutils/libdisklabel/getdisklabel.c
-===================================================================
--- /dev/null
-+++ ufsutils/libdisklabel/getdisklabel.c
++++ b/libdisklabel/getdisklabel.c
@@ -0,0 +1,8 @@
+#include <stdlib.h>
+#include <sys/disklabel.h>
Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/01_libufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,14 @@
-Index: ufsutils/libufs/type.c
-===================================================================
---- ufsutils.orig/libufs/type.c
-+++ ufsutils/libufs/type.c
-@@ -108,7 +108,7 @@
+---
+ include/ufs/ffs/fs.h | 5 ++++-
+ include/ufs/ufs/dinode.h | 2 ++
+ include/ufs/ufs/dir.h | 2 ++
+ libufs/Makefile | 29 ++++++++++-------------------
+ libufs/type.c | 4 +++-
+ 5 files changed, 21 insertions(+), 21 deletions(-)
+
+--- a/libufs/type.c
++++ b/libufs/type.c
+@@ -108,7 +108,7 @@ again: if ((ret = stat(name, &st)) < 0)
*/
name = oname;
}
@@ -11,7 +17,7 @@
/* This is what we need, do nothing. */
;
} else if ((fs = getfsfile(name)) != NULL) {
-@@ -131,8 +131,10 @@
+@@ -131,8 +131,10 @@ again: if ((ret = stat(name, &st)) < 0)
ERROR(disk, "could not find special device");
return (-1);
}
@@ -22,10 +28,8 @@
} else {
ERROR(disk, "could not find special device");
return (-1);
-Index: ufsutils/include/ufs/ffs/fs.h
-===================================================================
---- ufsutils.orig/include/ufs/ffs/fs.h
-+++ ufsutils/include/ufs/ffs/fs.h
+--- a/include/ufs/ffs/fs.h
++++ b/include/ufs/ffs/fs.h
@@ -33,6 +33,9 @@
#ifndef _UFS_FFS_FS_H_
#define _UFS_FFS_FS_H_
@@ -36,7 +40,7 @@
/*
* Each disk drive contains some number of filesystems.
* A filesystem consists of a number of cylinder groups.
-@@ -502,7 +502,7 @@
+@@ -502,7 +505,7 @@ struct cg {
* Turn filesystem block numbers into disk block addresses.
* This maps filesystem blocks to device size blocks.
*/
@@ -45,10 +49,8 @@
#define dbtofsb(fs, b) ((b) >> (fs)->fs_fsbtodb)
/*
-Index: ufsutils/include/ufs/ufs/dinode.h
-===================================================================
---- ufsutils.orig/include/ufs/ufs/dinode.h
-+++ ufsutils/include/ufs/ufs/dinode.h
+--- a/include/ufs/ufs/dinode.h
++++ b/include/ufs/ufs/dinode.h
@@ -68,6 +68,8 @@
#ifndef _UFS_UFS_DINODE_H_
#define _UFS_UFS_DINODE_H_
@@ -58,10 +60,8 @@
/*
* The root inode is the root of the filesystem. Inode 0 can't be used for
* normal purposes and historically bad blocks were linked to inode 1, thus
-Index: ufsutils/include/ufs/ufs/dir.h
-===================================================================
---- ufsutils.orig/include/ufs/ufs/dir.h
-+++ ufsutils/include/ufs/ufs/dir.h
+--- a/include/ufs/ufs/dir.h
++++ b/include/ufs/ufs/dir.h
@@ -38,6 +38,8 @@
#ifndef _UFS_UFS_DIR_H_
#define _UFS_UFS_DIR_H_
@@ -71,12 +71,10 @@
/*
* Theoretically, directories can be more than 2Gb in length, however, in
* practice this seems unlikely. So, we define the type doff_t as a 32-bit
-Index: ufsutils/libufs/Makefile
-===================================================================
---- ufsutils.orig/libufs/Makefile
-+++ ufsutils/libufs/Makefile
+--- a/libufs/Makefile
++++ b/libufs/Makefile
@@ -1,26 +1,17 @@
- # $FreeBSD: src/lib/libufs/Makefile,v 1.14.8.1 2009/04/15 03:14:26 kensmith Exp $
+ # $FreeBSD: src/lib/libufs/Makefile,v 1.14.10.1 2010/02/10 00:26:20 kensmith Exp $
LIB= ufs
-SHLIBDIR?= /lib
Modified: trunk/ufsutils/debian/patches/02_badsect.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_badsect.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_badsect.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,10 +1,12 @@
-Index: ufsutils/badsect.ufs/Makefile
-===================================================================
---- ufsutils.orig/badsect.ufs/Makefile
-+++ ufsutils/badsect.ufs/Makefile
+---
+ badsect.ufs/Makefile | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+--- a/badsect.ufs/Makefile
++++ b/badsect.ufs/Makefile
@@ -1,9 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/badsect/Makefile,v 1.8 2003/02/22 21:33:42 johan Exp $
+ # $FreeBSD: src/sbin/badsect/Makefile,v 1.8.36.1 2010/02/10 00:26:20 kensmith Exp $
-PROG= badsect
-DPADD= ${LIBUFS}
Modified: trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_bsdlabel.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,11 @@
-Index: ufsutils/bsdlabel/bsdlabel.c
-===================================================================
---- ufsutils.orig/bsdlabel/bsdlabel.c
-+++ ufsutils/bsdlabel/bsdlabel.c
-@@ -60,7 +60,9 @@
+---
+ bsdlabel/Makefile | 16 ++++++----------
+ bsdlabel/bsdlabel.c | 21 +++++++++++++++++++--
+ 2 files changed, 25 insertions(+), 12 deletions(-)
+
+--- a/bsdlabel/bsdlabel.c
++++ b/bsdlabel/bsdlabel.c
+@@ -60,7 +60,9 @@ __FBSDID("$FreeBSD: src/sbin/bsdlabel/bs
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/wait.h>
@@ -12,7 +15,7 @@
#define DKTYPENAMES
#define FSTYPENAMES
#include <sys/disklabel.h>
-@@ -68,7 +70,7 @@
+@@ -68,7 +70,7 @@ __FBSDID("$FreeBSD: src/sbin/bsdlabel/bs
#include <unistd.h>
#include <string.h>
#include <stdio.h>
@@ -21,7 +24,7 @@
#include <stdlib.h>
#include <signal.h>
#include <stdarg.h>
-@@ -476,8 +478,12 @@
+@@ -476,8 +478,12 @@ readlabel(int flag)
err(1, specname);
if (is_file)
get_file_parms(f);
@@ -34,7 +37,7 @@
err(4, "cannot get disk geometry");
}
if (mediasize > (off_t)0xffffffff * secsize)
-@@ -665,10 +671,12 @@
+@@ -665,10 +671,12 @@ editit(void)
omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP));
while ((pid = fork()) < 0) {
@@ -47,7 +50,7 @@
if (errno != EAGAIN) {
warn("fork");
return(0);
-@@ -1426,8 +1434,12 @@
+@@ -1426,8 +1434,12 @@ getvirginlabel(void)
if (is_file)
get_file_parms(f);
@@ -60,7 +63,7 @@
close (f);
return (NULL);
}
-@@ -1443,13 +1455,18 @@
+@@ -1443,13 +1455,18 @@ getvirginlabel(void)
* to get any good ideas from the device, construct something
* which is IBM-PC friendly.
*/
@@ -80,10 +83,8 @@
loclab.d_ntracks = 1;
else if (loclab.d_secperunit <= 63*16*1024)
loclab.d_ntracks = 16;
-Index: ufsutils/bsdlabel/Makefile
-===================================================================
---- ufsutils.orig/bsdlabel/Makefile
-+++ ufsutils/bsdlabel/Makefile
+--- a/bsdlabel/Makefile
++++ b/bsdlabel/Makefile
@@ -4,14 +4,8 @@
.PATH: ${.CURDIR}/../../sys/geom
@@ -101,7 +102,7 @@
DPADD= ${LIBGEOM}
LDADD= -lgeom
-@@ -19,7 +13,9 @@
+@@ -19,7 +13,9 @@ LDADD= -lgeom
.include <bsd.prog.mk>
test: ${PROG}
Modified: trunk/ufsutils/debian/patches/02_dump.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dump.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_dump.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,9 @@
-Index: ufsutils/dump.ufs/Makefile
-===================================================================
---- ufsutils.orig/dump.ufs/Makefile
-+++ ufsutils/dump.ufs/Makefile
+---
+ dump.ufs/Makefile | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+--- a/dump.ufs/Makefile
++++ b/dump.ufs/Makefile
@@ -15,9 +15,14 @@
PROG= dump
Modified: trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,11 @@
-Index: ufsutils/dumpfs.ufs/dumpfs.c
-===================================================================
---- ufsutils.orig/dumpfs.ufs/dumpfs.c
-+++ ufsutils/dumpfs.ufs/dumpfs.c
-@@ -62,6 +62,7 @@
+---
+ dumpfs.ufs/Makefile | 14 +++++++++-----
+ dumpfs.ufs/dumpfs.c | 1 +
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+--- a/dumpfs.ufs/dumpfs.c
++++ b/dumpfs.ufs/dumpfs.c
+@@ -68,6 +68,7 @@ static const char rcsid[] =
#include <fcntl.h>
#include <fstab.h>
#include <libufs.h>
@@ -10,13 +13,11 @@
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-Index: ufsutils/dumpfs.ufs/Makefile
-===================================================================
---- ufsutils.orig/dumpfs.ufs/Makefile
-+++ ufsutils/dumpfs.ufs/Makefile
+--- a/dumpfs.ufs/Makefile
++++ b/dumpfs.ufs/Makefile
@@ -1,9 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9 2003/11/14 13:13:23 johan Exp $
+ # $FreeBSD: src/sbin/dumpfs/Makefile,v 1.9.34.1 2010/02/10 00:26:20 kensmith Exp $
-PROG= dumpfs
-DPADD= ${LIBUFS}
Modified: trunk/ufsutils/debian/patches/02_ffsinfo.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_ffsinfo.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_ffsinfo.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,9 +1,11 @@
-Index: ufsutils/ffsinfo/Makefile
-===================================================================
---- ufsutils.orig/ffsinfo/Makefile
-+++ ufsutils/ffsinfo/Makefile
+---
+ ffsinfo/Makefile | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+--- a/ffsinfo/Makefile
++++ b/ffsinfo/Makefile
@@ -4,16 +4,12 @@
- # $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.7 2004/04/01 20:31:48 johan Exp $
+ # $FreeBSD: src/sbin/ffsinfo/Makefile,v 1.7.32.1 2010/02/10 00:26:20 kensmith Exp $
#
-GROWFS= ${.CURDIR}/../growfs
Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,10 +1,22 @@
-Index: ufsutils/fsck.ufs/gjournal.c
-===================================================================
---- ufsutils.orig/fsck.ufs/gjournal.c
-+++ ufsutils/fsck.ufs/gjournal.c
+---
+ fsck.ufs/Makefile | 27 +++++++++++-------------
+ fsck.ufs/ea.c | 2 -
+ fsck.ufs/fsck.h | 1
+ fsck.ufs/fsck_ffs.8 | 7 ++----
+ fsck.ufs/fsutil.c | 13 ++++++++++-
+ fsck.ufs/gjournal.c | 4 +++
+ fsck.ufs/inode.c | 3 +-
+ fsck.ufs/main.c | 56 +++++++++++++++++++++++++++++++++++++++++++++------
+ fsck.ufs/pass1.c | 2 +
+ fsck.ufs/setup.c | 14 ++++++++++++
+ fsck.ufs/utilities.c | 6 +++--
+ 11 files changed, 105 insertions(+), 30 deletions(-)
+
+--- a/fsck.ufs/gjournal.c
++++ b/fsck.ufs/gjournal.c
@@ -54,6 +54,9 @@
#include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2.8.1 2009/04/15 03:14:26 kensmith Exp $");
+ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2.2.1.2.1 2010/02/10 00:26:20 kensmith Exp $");
+
+#if HAVE_UFS_SNAPSHOT
@@ -12,16 +24,14 @@
#include <sys/param.h>
#include <sys/disklabel.h>
#include <sys/mount.h>
-@@ -774,3 +777,4 @@
+@@ -774,3 +777,4 @@ gjournal_check(const char *filesys)
/* Write back updated statistics and super-block. */
putdisk();
}
+#endif
-Index: ufsutils/fsck.ufs/ea.c
-===================================================================
---- ufsutils.orig/fsck.ufs/ea.c
-+++ ufsutils/fsck.ufs/ea.c
-@@ -38,7 +38,7 @@
+--- a/fsck.ufs/ea.c
++++ b/fsck.ufs/ea.c
+@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/ea
#include <sys/param.h>
#include <sys/time.h>
@@ -30,12 +40,10 @@
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/dir.h>
-Index: ufsutils/fsck.ufs/fsck_ffs.8
-===================================================================
---- ufsutils.orig/fsck.ufs/fsck_ffs.8
-+++ ufsutils/fsck.ufs/fsck_ffs.8
+--- a/fsck.ufs/fsck_ffs.8
++++ b/fsck.ufs/fsck_ffs.8
@@ -30,11 +30,11 @@
- .\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34.2.5.2.2 2009/04/27 19:15:33 delphij Exp $
+ .\" $FreeBSD: src/sbin/fsck_ffs/fsck_ffs.8,v 1.34.2.6.2.1 2010/02/10 00:26:20 kensmith Exp $
.\"
.Dd January 25, 2009
-.Dt FSCK_FFS 8
@@ -49,17 +57,15 @@
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
.Nm
-@@ -341,5 +341,4 @@
+@@ -341,5 +341,4 @@ are fully enumerated and explained in Ap
.Xr fstab 5 ,
.Xr fsck 8 ,
.Xr fsdb 8 ,
-.Xr newfs 8 ,
.Xr reboot 8
-Index: ufsutils/fsck.ufs/fsutil.c
-===================================================================
---- ufsutils.orig/fsck.ufs/fsutil.c
-+++ ufsutils/fsck.ufs/fsutil.c
-@@ -38,7 +38,9 @@
+--- a/fsck.ufs/fsutil.c
++++ b/fsck.ufs/fsutil.c
+@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/fs
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
@@ -69,7 +75,7 @@
#include <sys/disklabel.h>
#include <sys/stat.h>
#include <sys/disklabel.h>
-@@ -55,6 +57,7 @@
+@@ -55,6 +57,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/fs
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -77,7 +83,7 @@
#include <unistd.h>
#include "fsck.h"
-@@ -277,11 +280,13 @@
+@@ -277,11 +280,13 @@ ckfini(int markclean)
if (bkgrdflag) {
unlink(snapname);
if ((!(sblock.fs_flags & FS_UNCLEAN)) != markclean) {
@@ -91,7 +97,7 @@
if (!preen) {
printf("\n***** FILE SYSTEM MARKED %s *****\n",
markclean ? "CLEAN" : "DIRTY");
-@@ -593,7 +598,7 @@
+@@ -593,7 +598,7 @@ getpathname(char *namebuf, ino_t curdir,
}
void
@@ -100,7 +106,7 @@
{
ckfini(0);
-@@ -606,7 +611,7 @@
+@@ -606,7 +611,7 @@ catch(int sig __unused)
* so that reboot sequence may be interrupted.
*/
void
@@ -109,7 +115,7 @@
{
printf("returning to single-user after file system check\n");
returntosingle = 1;
-@@ -675,11 +680,13 @@
+@@ -675,11 +680,13 @@ pfatal(const char *fmt, ...)
* Force foreground fsck to clean up inconsistency.
*/
if (bkgrdflag) {
@@ -123,7 +129,7 @@
fprintf(stdout, "CANNOT RUN IN BACKGROUND\n");
ckfini(0);
exit(EEXIT);
-@@ -696,6 +703,7 @@
+@@ -696,6 +703,7 @@ pfatal(const char *fmt, ...)
/*
* Force foreground fsck to clean up inconsistency.
*/
@@ -131,7 +137,7 @@
if (bkgrdflag) {
cmd.value = FS_NEEDSFSCK;
cmd.size = 1;
-@@ -703,6 +711,7 @@
+@@ -703,6 +711,7 @@ pfatal(const char *fmt, ...)
&cmd, sizeof cmd) == -1)
pwarn("CANNOT SET FS_NEEDSFSCK FLAG\n");
}
@@ -139,12 +145,10 @@
ckfini(0);
exit(EEXIT);
}
-Index: ufsutils/fsck.ufs/inode.c
-===================================================================
---- ufsutils.orig/fsck.ufs/inode.c
-+++ ufsutils/fsck.ufs/inode.c
-@@ -36,7 +36,7 @@
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38.2.1.2.1 2009/04/15 03:14:26 kensmith Exp $");
+--- a/fsck.ufs/inode.c
++++ b/fsck.ufs/inode.c
+@@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)inode.
+ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.38.2.1.4.1 2010/02/10 00:26:20 kensmith Exp $");
#include <sys/param.h>
-#include <sys/stdint.h>
@@ -152,7 +156,7 @@
#include <sys/time.h>
#include <sys/sysctl.h>
-@@ -47,6 +47,7 @@
+@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/in
#include <err.h>
#include <pwd.h>
#include <string.h>
@@ -160,11 +164,9 @@
#include "fsck.h"
-Index: ufsutils/fsck.ufs/main.c
-===================================================================
---- ufsutils.orig/fsck.ufs/main.c
-+++ ufsutils/fsck.ufs/main.c
-@@ -45,9 +45,17 @@
+--- a/fsck.ufs/main.c
++++ b/fsck.ufs/main.c
+@@ -45,9 +45,17 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/ma
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/time.h>
@@ -182,7 +184,7 @@
#include <sys/uio.h>
#include <sys/disklabel.h>
-@@ -62,14 +70,18 @@
+@@ -62,14 +70,18 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/ma
#include <paths.h>
#include <stdint.h>
#include <string.h>
@@ -202,7 +204,7 @@
int
main(int argc, char *argv[])
-@@ -78,11 +90,12 @@
+@@ -78,11 +90,12 @@ main(int argc, char *argv[])
struct rlimit rlimit;
struct itimerval itimerval;
int ret = 0;
@@ -216,7 +218,7 @@
switch (ch) {
case 'b':
skipclean = 0;
-@@ -130,6 +143,7 @@
+@@ -130,6 +143,7 @@ main(int argc, char *argv[])
yflag = 0;
break;
@@ -224,7 +226,7 @@
case 'p':
preen++;
/*FALLTHROUGH*/
-@@ -144,20 +158,22 @@
+@@ -144,20 +158,22 @@ main(int argc, char *argv[])
break;
default:
@@ -249,7 +251,7 @@
if (bkgrdflag) {
signal(SIGALRM, alarmhandler);
itimerval.it_interval.tv_sec = 5;
-@@ -204,8 +220,10 @@
+@@ -204,8 +220,10 @@ checkfilesys(char *filesys)
ufs2_daddr_t n_ffree, n_bfree;
struct dups *dp;
struct statfs *mntp;
@@ -260,7 +262,7 @@
ufs2_daddr_t blks;
struct iovec *iov;
char errmsg[255];
-@@ -227,10 +245,14 @@
+@@ -227,10 +245,14 @@ checkfilesys(char *filesys)
* if it is listed among the mounted file systems. Failing that
* check to see if it is listed in /etc/fstab.
*/
@@ -275,7 +277,7 @@
filesys = blockcheck(filesys);
/*
* If -F flag specified, check to see whether a background check
-@@ -248,8 +270,10 @@
+@@ -248,8 +270,10 @@ checkfilesys(char *filesys)
if ((sblock.fs_flags & FS_DOSOFTDEP) == 0)
exit(5); /* Not running soft updates */
size = MIBSIZE;
@@ -286,7 +288,7 @@
if ((mntp == NULL && sblock.fs_clean == 1) ||
(mntp != NULL && (sblock.fs_flags & FS_UNCLEAN) == 0))
exit(7); /* Filesystem clean, report it now */
-@@ -262,6 +286,7 @@
+@@ -262,6 +286,7 @@ checkfilesys(char *filesys)
if ((fsreadfd = open(filesys, O_RDONLY)) < 0 || readsb(0) == 0)
exit(3); /* Cannot read superblock */
close(fsreadfd);
@@ -294,7 +296,7 @@
if ((sblock.fs_flags & FS_GJOURNAL) != 0) {
//printf("GJournaled file system detected on %s.\n",
// filesys);
-@@ -279,6 +304,7 @@
+@@ -279,6 +304,7 @@ checkfilesys(char *filesys)
"CANNOT RUN FAST FSCK\n");
}
}
@@ -302,7 +304,7 @@
}
/*
* If we are to do a background check:
-@@ -287,6 +313,7 @@
+@@ -287,6 +313,7 @@ checkfilesys(char *filesys)
* return created snapshot file
* if not found, clear bkgrdflag and proceed with normal fsck
*/
@@ -310,7 +312,7 @@
if (bkgrdflag) {
if (mntp == NULL) {
bkgrdflag = 0;
-@@ -374,6 +401,7 @@
+@@ -374,6 +401,7 @@ checkfilesys(char *filesys)
filesys = snapname;
}
}
@@ -318,7 +320,7 @@
switch (setup(filesys)) {
case 0:
-@@ -381,7 +409,9 @@
+@@ -381,7 +409,9 @@ checkfilesys(char *filesys)
pfatal("CAN'T CHECK FILE SYSTEM.");
return (0);
case -1:
@@ -328,7 +330,7 @@
pwarn("clean, %ld free ", (long)(sblock.fs_cstotal.cs_nffree +
sblock.fs_frag * sblock.fs_cstotal.cs_nbfree));
printf("(%lld frags, %lld blocks, %.1f%% fragmentation)\n",
-@@ -401,8 +431,10 @@
+@@ -401,8 +431,10 @@ checkfilesys(char *filesys)
*/
if (preen == 0) {
printf("** Last Mounted on %s\n", sblock.fs_fsmnt);
@@ -339,7 +341,7 @@
printf("** Phase 1 - Check Blocks and Sizes\n");
}
pass1();
-@@ -501,8 +533,13 @@
+@@ -501,8 +533,13 @@ checkfilesys(char *filesys)
/*
* Check to see if the file system is mounted read-write.
*/
@@ -353,7 +355,7 @@
ckfini(resolved);
for (cylno = 0; cylno < sblock.fs_ncg; cylno++)
-@@ -545,6 +582,8 @@
+@@ -545,6 +582,8 @@ chkdoreload(struct statfs *mntp)
* it unless it is read-write, so we can continue using it
* as safely as possible.
*/
@@ -362,7 +364,7 @@
if (mntp->f_flags & MNT_RDONLY) {
/*
* XXX: Need to kick out MNT_ROOTFS until we fix
-@@ -573,8 +612,12 @@
+@@ -573,8 +612,12 @@ chkdoreload(struct statfs *mntp)
return (1);
}
return (0);
@@ -375,7 +377,7 @@
/*
* Get the mount point information for name.
*/
-@@ -614,13 +657,14 @@
+@@ -614,13 +657,14 @@ getmntpt(const char *name)
statfsp = NULL;
return (statfsp);
}
@@ -392,11 +394,9 @@
+ progname);
exit(1);
}
-Index: ufsutils/fsck.ufs/pass1.c
-===================================================================
---- ufsutils.orig/fsck.ufs/pass1.c
-+++ ufsutils/fsck.ufs/pass1.c
-@@ -317,9 +317,11 @@
+--- a/fsck.ufs/pass1.c
++++ b/fsck.ufs/pass1.c
+@@ -319,9 +319,11 @@ checkinode(ino_t inumber, struct inodesc
inoinfo(inumber)->ino_type = IFTODT(mode);
badblk = dupblk = 0;
idesc->id_number = inumber;
@@ -408,12 +408,10 @@
idesc->id_type = ADDR;
(void)ckinode(dp, idesc);
if (sblock.fs_magic == FS_UFS2_MAGIC && dp->dp2.di_extsize > 0) {
-Index: ufsutils/fsck.ufs/setup.c
-===================================================================
---- ufsutils.orig/fsck.ufs/setup.c
-+++ ufsutils/fsck.ufs/setup.c
-@@ -36,11 +36,14 @@
- __FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50.2.2.2.2 2009/04/27 19:15:33 delphij Exp $");
+--- a/fsck.ufs/setup.c
++++ b/fsck.ufs/setup.c
+@@ -36,11 +36,14 @@ static const char sccsid[] = "@(#)setup.
+ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.50.2.3.2.1 2010/02/10 00:26:20 kensmith Exp $");
#include <sys/param.h>
+#include <sys/types.h>
@@ -427,7 +425,7 @@
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-@@ -51,6 +54,7 @@
+@@ -51,6 +54,7 @@ __FBSDID("$FreeBSD: src/sbin/fsck_ffs/se
#include <limits.h>
#include <stdint.h>
#include <string.h>
@@ -435,7 +433,7 @@
#include "fsck.h"
-@@ -87,6 +91,7 @@
+@@ -87,6 +91,7 @@ setup(char *dev)
}
return (0);
}
@@ -443,7 +441,7 @@
if ((statb.st_mode & S_IFMT) != S_IFCHR &&
(statb.st_mode & S_IFMT) != S_IFBLK) {
if (bkgrdflag != 0 && (statb.st_flags & SF_SNAPSHOT) == 0) {
-@@ -121,6 +126,7 @@
+@@ -121,6 +126,7 @@ setup(char *dev)
}
}
}
@@ -451,7 +449,7 @@
if ((fsreadfd = open(dev, O_RDONLY)) < 0) {
if (bkgrdflag) {
unlink(snapname);
-@@ -131,6 +137,7 @@
+@@ -131,6 +137,7 @@ setup(char *dev)
}
if (bkgrdflag) {
unlink(snapname);
@@ -459,7 +457,7 @@
size = MIBSIZE;
if (sysctlnametomib("vfs.ffs.adjrefcnt", adjrefcnt, &size) < 0||
sysctlnametomib("vfs.ffs.adjblkcnt", adjblkcnt, &size) < 0||
-@@ -160,6 +167,7 @@
+@@ -160,6 +167,7 @@ setup(char *dev)
}
cmd.version = FFS_CMD_VERSION;
cmd.handle = fsreadfd;
@@ -467,7 +465,7 @@
fswritefd = -1;
}
if (preen == 0)
-@@ -471,6 +479,8 @@
+@@ -471,6 +479,8 @@ calcsb(char *dev, int devfd, struct fs *
return (0);
}
lp = getdisklabel(dev, devfd);
@@ -476,7 +474,7 @@
if (isdigit(*cp))
pp = &lp->d_partitions[0];
else
-@@ -521,13 +531,17 @@
+@@ -521,13 +531,17 @@ calcsb(char *dev, int devfd, struct fs *
static struct disklabel *
getdisklabel(char *s, int fd)
{
@@ -494,11 +492,9 @@
return (&lab);
+#endif
}
-Index: ufsutils/fsck.ufs/utilities.c
-===================================================================
---- ufsutils.orig/fsck.ufs/utilities.c
-+++ ufsutils/fsck.ufs/utilities.c
-@@ -108,14 +108,16 @@
+--- a/fsck.ufs/utilities.c
++++ b/fsck.ufs/utilities.c
+@@ -108,14 +108,16 @@ retry:
return (origname);
}
@@ -517,12 +513,10 @@
{
got_sigalarm = 1;
}
-Index: ufsutils/fsck.ufs/Makefile
-===================================================================
---- ufsutils.orig/fsck.ufs/Makefile
-+++ ufsutils/fsck.ufs/Makefile
+--- a/fsck.ufs/Makefile
++++ b/fsck.ufs/Makefile
@@ -1,19 +1,18 @@
- # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18.8.1 2009/04/15 03:14:26 kensmith Exp $
+ # $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.18.12.1 2010/02/10 00:26:20 kensmith Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
-PROG= fsck_ffs
Modified: trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsdb.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_fsdb.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,13 @@
-Index: ufsutils/fsdb.ufs/fsdb.8
-===================================================================
---- ufsutils.orig/fsdb.ufs/fsdb.8
-+++ ufsutils/fsdb.ufs/fsdb.8
-@@ -263,7 +263,7 @@
+---
+ fsdb.ufs/Makefile | 20 +++++++++-----------
+ fsdb.ufs/fsdb.8 | 2 +-
+ fsdb.ufs/fsdb.c | 14 +++++++++++++-
+ fsdb.ufs/fsdbutil.c | 13 ++++++++++++-
+ 4 files changed, 35 insertions(+), 14 deletions(-)
+
+--- a/fsdb.ufs/fsdb.8
++++ b/fsdb.ufs/fsdb.8
+@@ -263,7 +263,7 @@ There are a bunch of other things that y
.Nm
does not implement.
.Sh WARNING
@@ -11,11 +16,9 @@
beyond what
.Xr fsck 8
can repair.
-Index: ufsutils/fsdb.ufs/fsdb.c
-===================================================================
---- ufsutils.orig/fsdb.ufs/fsdb.c
-+++ ufsutils/fsdb.ufs/fsdb.c
-@@ -35,13 +35,13 @@
+--- a/fsdb.ufs/fsdb.c
++++ b/fsdb.ufs/fsdb.c
+@@ -35,13 +35,13 @@ static const char rcsid[] =
#include <sys/param.h>
#include <sys/time.h>
@@ -30,7 +33,7 @@
#include <ufs/ufs/dinode.h>
#include <ufs/ufs/dir.h>
-@@ -60,6 +60,18 @@
+@@ -60,6 +60,18 @@ static int find_blks64(uint64_t *buf, in
static int find_indirblks32(uint32_t blk, int ind_level, uint32_t *blknum);
static int find_indirblks64(uint64_t blk, int ind_level, uint64_t *blknum);
@@ -49,11 +52,9 @@
static void
usage(void)
{
-Index: ufsutils/fsdb.ufs/fsdbutil.c
-===================================================================
---- ufsutils.orig/fsdb.ufs/fsdbutil.c
-+++ ufsutils/fsdb.ufs/fsdbutil.c
-@@ -41,7 +41,6 @@
+--- a/fsdb.ufs/fsdbutil.c
++++ b/fsdb.ufs/fsdbutil.c
+@@ -41,7 +41,6 @@ static const char rcsid[] =
#include <stdint.h>
#include <string.h>
#include <time.h>
@@ -61,7 +62,7 @@
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-@@ -51,6 +50,18 @@
+@@ -51,6 +50,18 @@ static const char rcsid[] =
#include "fsdb.h"
#include "fsck.h"
@@ -80,13 +81,11 @@
static int charsperline(void);
static int printindir(ufs2_daddr_t blk, int level, char *bufp);
static void printblocks(ino_t inum, union dinode *dp);
-Index: ufsutils/fsdb.ufs/Makefile
-===================================================================
---- ufsutils.orig/fsdb.ufs/Makefile
-+++ ufsutils/fsdb.ufs/Makefile
+--- a/fsdb.ufs/Makefile
++++ b/fsdb.ufs/Makefile
@@ -2,15 +2,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/fsdb/Makefile,v 1.19 2004/10/09 15:56:34 le Exp $
+ # $FreeBSD: src/sbin/fsdb/Makefile,v 1.19.24.1 2010/02/10 00:26:20 kensmith Exp $
-PROG= fsdb
-MAN= fsdb.8
Modified: trunk/ufsutils/debian/patches/02_growfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_growfs.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_growfs.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,11 @@
-Index: ufsutils/growfs.ufs/growfs.c
-===================================================================
---- ufsutils.orig/growfs.ufs/growfs.c
-+++ ufsutils/growfs.ufs/growfs.c
-@@ -51,10 +51,10 @@
+---
+ growfs.ufs/Makefile | 20 ++++++++++++--------
+ growfs.ufs/growfs.c | 8 +++++++-
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+--- a/growfs.ufs/growfs.c
++++ b/growfs.ufs/growfs.c
+@@ -51,10 +51,10 @@ __FBSDID("$FreeBSD: src/sbin/growfs/grow
/* ********************************************************** INCLUDES ***** */
#include <sys/param.h>
@@ -14,7 +17,7 @@
#include <stdio.h>
#include <paths.h>
-@@ -1929,10 +1929,12 @@
+@@ -1929,10 +1929,12 @@ get_dev_size(int fd, int *size)
int sectorsize;
off_t mediasize;
@@ -27,7 +30,7 @@
if (sectorsize <= 0)
errx(1, "bogus sectorsize: %d", sectorsize);
-@@ -2288,9 +2290,11 @@
+@@ -2288,9 +2290,11 @@ return_disklabel(int fd, struct disklabe
}
lp->d_checksum=sum;
@@ -39,7 +42,7 @@
}
free(lp);
-@@ -2314,8 +2318,10 @@
+@@ -2314,8 +2318,10 @@ get_disklabel(int fd)
if (!lab)
errx(1, "malloc failed");
@@ -50,10 +53,8 @@
unlabeled++;
-Index: ufsutils/growfs.ufs/Makefile
-===================================================================
---- ufsutils.orig/growfs.ufs/Makefile
-+++ ufsutils/growfs.ufs/Makefile
+--- a/growfs.ufs/Makefile
++++ b/growfs.ufs/Makefile
@@ -6,14 +6,18 @@
#GFSDBG=
Modified: trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_mkfs.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_mkfs.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,12 @@
-Index: ufsutils/mkfs.ufs/mkfs.c
-===================================================================
---- ufsutils.orig/mkfs.ufs/mkfs.c
-+++ ufsutils/mkfs.ufs/mkfs.c
-@@ -53,6 +53,7 @@
+---
+ mkfs.ufs/Makefile | 23 +++++++++++++----------
+ mkfs.ufs/mkfs.c | 1 +
+ mkfs.ufs/newfs.c | 21 +++++++++++++++++----
+ 3 files changed, 31 insertions(+), 14 deletions(-)
+
+--- a/mkfs.ufs/mkfs.c
++++ b/mkfs.ufs/mkfs.c
+@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD: src/sbin/newfs/mkfs.
#include <stdint.h>
#include <stdio.h>
#include <unistd.h>
@@ -10,11 +14,9 @@
#include <sys/param.h>
#include <sys/time.h>
#include <sys/types.h>
-Index: ufsutils/mkfs.ufs/newfs.c
-===================================================================
---- ufsutils.orig/mkfs.ufs/newfs.c
-+++ ufsutils/mkfs.ufs/newfs.c
-@@ -55,7 +55,6 @@
+--- a/mkfs.ufs/newfs.c
++++ b/mkfs.ufs/newfs.c
+@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD: src/sbin/newfs/newfs
*/
#include <sys/param.h>
#include <sys/stat.h>
@@ -22,7 +24,7 @@
#include <sys/disklabel.h>
#include <sys/file.h>
#include <sys/mount.h>
-@@ -140,6 +139,7 @@
+@@ -140,6 +139,7 @@ struct uufsd disk; /* libufs disk struc
static char device[MAXPATHLEN];
static char *disktype;
static int unlabeled;
@@ -30,7 +32,7 @@
static struct disklabel *getdisklabel(char *s);
static void rewritelabel(char *s, struct disklabel *lp);
-@@ -156,6 +156,8 @@
+@@ -156,6 +156,8 @@ main(int argc, char *argv[])
int ch, i;
off_t mediasize;
@@ -39,7 +41,7 @@
while ((ch = getopt(argc, argv,
"EJL:NO:RS:T:Ua:b:c:d:e:f:g:h:i:lm:no:s:")) != -1)
switch (ch) {
-@@ -297,12 +299,19 @@
+@@ -297,12 +299,19 @@ main(int argc, char *argv[])
}
if (fstat(disk.d_fd, &st) < 0)
err(1, "%s", special);
@@ -60,7 +62,7 @@
if (fssize == 0)
fssize = mediasize / sectorsize;
else if (fssize > mediasize / sectorsize)
-@@ -375,7 +384,7 @@
+@@ -375,7 +384,7 @@ main(int argc, char *argv[])
pp->p_size *= secperblk;
}
mkfs(pp, special);
@@ -69,7 +71,7 @@
if (realsectorsize != DEV_BSIZE)
pp->p_size /= realsectorsize / DEV_BSIZE;
if (!Nflag && bcmp(pp, &oldpartition, sizeof(oldpartition)))
-@@ -388,6 +397,7 @@
+@@ -388,6 +397,7 @@ main(int argc, char *argv[])
struct disklabel *
getdisklabel(char *s)
{
@@ -77,7 +79,7 @@
static struct disklabel lab;
struct disklabel *lp;
-@@ -399,6 +409,7 @@
+@@ -399,6 +409,7 @@ getdisklabel(char *s)
if (lp != NULL)
return (lp);
}
@@ -85,7 +87,7 @@
return (NULL);
}
-@@ -409,8 +420,10 @@
+@@ -409,8 +420,10 @@ rewritelabel(char *s, struct disklabel *
return;
lp->d_checksum = 0;
lp->d_checksum = dkcksum(lp);
@@ -96,7 +98,7 @@
}
static void
-@@ -418,7 +431,7 @@
+@@ -418,7 +431,7 @@ usage()
{
fprintf(stderr,
"usage: %s [ -fsoptions ] special-device%s\n",
@@ -105,13 +107,11 @@
" [device-type]");
fprintf(stderr, "where fsoptions are:\n");
fprintf(stderr, "\t-J Enable journaling via gjournal\n");
-Index: ufsutils/mkfs.ufs/Makefile
-===================================================================
---- ufsutils.orig/mkfs.ufs/Makefile
-+++ ufsutils/mkfs.ufs/Makefile
+--- a/mkfs.ufs/Makefile
++++ b/mkfs.ufs/Makefile
@@ -1,17 +1,20 @@
# @(#)Makefile 8.2 (Berkeley) 3/27/94
- # $FreeBSD: src/sbin/newfs/Makefile,v 1.22 2003/02/11 03:06:45 jmallett Exp $
+ # $FreeBSD: src/sbin/newfs/Makefile,v 1.22.34.1 2010/02/10 00:26:20 kensmith Exp $
-PROG= newfs
-DPADD= ${LIBUFS}
Modified: trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_tunefs.ufs.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/02_tunefs.ufs.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,8 +1,11 @@
-Index: ufsutils/tunefs.ufs/tunefs.c
-===================================================================
---- ufsutils.orig/tunefs.ufs/tunefs.c
-+++ ufsutils/tunefs.ufs/tunefs.c
-@@ -48,8 +48,15 @@
+---
+ tunefs.ufs/Makefile | 13 ++++++++-----
+ tunefs.ufs/tunefs.c | 15 +++++++++++++++
+ 2 files changed, 23 insertions(+), 5 deletions(-)
+
+--- a/tunefs.ufs/tunefs.c
++++ b/tunefs.ufs/tunefs.c
+@@ -48,8 +48,15 @@ __FBSDID("$FreeBSD: src/sbin/tunefs/tune
#include <sys/mount.h>
#include <sys/disklabel.h>
#include <sys/stat.h>
@@ -18,7 +21,7 @@
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-@@ -84,8 +91,12 @@
+@@ -84,8 +91,12 @@ main(int argc, char *argv[])
int mflag, mvalue, nflag, oflag, ovalue, pflag, sflag, svalue;
int ch, found_arg, i;
const char *chg[2];
@@ -31,7 +34,7 @@
if (argc < 3)
usage();
-@@ -241,9 +252,11 @@
+@@ -241,9 +252,11 @@ main(int argc, char *argv[])
goto err;
if (disk.d_name != special) {
special = disk.d_name;
@@ -43,7 +46,7 @@
}
if (pflag) {
-@@ -402,6 +415,7 @@
+@@ -402,6 +415,7 @@ main(int argc, char *argv[])
if (sbwrite(&disk, Aflag) == -1)
goto err;
ufs_disk_close(&disk);
@@ -51,7 +54,7 @@
if (active) {
bzero(&args, sizeof(args));
if (mount("ufs", on,
-@@ -409,6 +423,7 @@
+@@ -409,6 +423,7 @@ main(int argc, char *argv[])
err(9, "%s: reload", special);
warnx("file system reloaded");
}
@@ -59,13 +62,11 @@
exit(0);
err:
if (disk.d_error != NULL)
-Index: ufsutils/tunefs.ufs/Makefile
-===================================================================
---- ufsutils.orig/tunefs.ufs/Makefile
-+++ ufsutils/tunefs.ufs/Makefile
+--- a/tunefs.ufs/Makefile
++++ b/tunefs.ufs/Makefile
@@ -1,9 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
- # $FreeBSD: src/sbin/tunefs/Makefile,v 1.8 2003/01/23 08:15:05 ru Exp $
+ # $FreeBSD: src/sbin/tunefs/Makefile,v 1.8.36.1 2010/02/10 00:26:20 kensmith Exp $
-PROG= tunefs
-DPADD= ${LIBUFS}
Modified: trunk/ufsutils/debian/patches/03_ufsmount.patch
===================================================================
--- trunk/ufsutils/debian/patches/03_ufsmount.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/03_ufsmount.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,9 @@
-Index: ufsutils/include/ufs/ufs/ufsmount.h
-===================================================================
---- ufsutils.orig/include/ufs/ufs/ufsmount.h
-+++ ufsutils/include/ufs/ufs/ufsmount.h
+---
+ include/ufs/ufs/ufsmount.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/include/ufs/ufs/ufsmount.h
++++ b/include/ufs/ufs/ufsmount.h
@@ -33,8 +33,6 @@
#ifndef _UFS_UFS_UFSMOUNT_H_
#define _UFS_UFS_UFSMOUNT_H_
Modified: trunk/ufsutils/debian/patches/99_makefiles.patch
===================================================================
--- trunk/ufsutils/debian/patches/99_makefiles.patch 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/patches/99_makefiles.patch 2011-05-26 02:53:11 UTC (rev 3329)
@@ -1,7 +1,10 @@
-Index: ufsutils/Makefile
-===================================================================
+---
+ Makefile | 28 +++++++++++++++++
+ Makefile.common | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 120 insertions(+)
+
--- /dev/null
-+++ ufsutils/Makefile
++++ b/Makefile
@@ -0,0 +1,28 @@
+#
+# ufsutils Makefile
@@ -31,10 +34,8 @@
+
+.PHONY: all clean install $(SUBDIRS) $(clean_targets) $(install_targets)
+
-Index: ufsutils/Makefile.common
-===================================================================
--- /dev/null
-+++ ufsutils/Makefile.common
++++ b/Makefile.common
@@ -0,0 +1,92 @@
+#
+# $Id: Makefile.common 45 2004-05-03 11:07:29Z guillem $
Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules 2011-05-26 00:51:25 UTC (rev 3328)
+++ trunk/ufsutils/debian/rules 2011-05-26 02:53:11 UTC (rev 3329)
@@ -6,7 +6,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-this = $(MAKE) -f debian/rules
lib = libufs2
DESTDIR = $(CURDIR)/debian/tmp
@@ -29,9 +28,7 @@
CFLAGS += -O2
endif
-include /usr/share/quilt/quilt.make
-
-build: patch
+build:
dh_testdir
CFLAGS="$(CFLAGS)" LDADD="$(LDADD)" $(MAKE)
@@ -42,8 +39,6 @@
[ ! -f Makefile ] || $(MAKE) clean
- $(this) unpatch
-
dh_clean
install: build
Added: trunk/ufsutils/debian/source/format
===================================================================
--- trunk/ufsutils/debian/source/format (rev 0)
+++ trunk/ufsutils/debian/source/format 2011-05-26 02:53:11 UTC (rev 3329)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Glibc-bsd-commits
mailing list