[Glibc-bsd-commits] r5222 - in trunk/freebsd-utils/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Sat Dec 7 22:34:12 UTC 2013
Author: rmh
Date: 2013-12-07 22:34:12 +0000 (Sat, 07 Dec 2013)
New Revision: 5222
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/devd-udeb.install
trunk/freebsd-utils/debian/devd.install
trunk/freebsd-utils/debian/devd.manpages
trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install
trunk/freebsd-utils/debian/freebsd-net-tools.install
trunk/freebsd-utils/debian/freebsd-net-tools.manpages
trunk/freebsd-utils/debian/freebsd-nfs-common.install
trunk/freebsd-utils/debian/freebsd-nfs-common.manpages
trunk/freebsd-utils/debian/freebsd-nfs-server.install
trunk/freebsd-utils/debian/freebsd-nfs-server.manpages
trunk/freebsd-utils/debian/freebsd-ppp.docs
trunk/freebsd-utils/debian/freebsd-ppp.install
trunk/freebsd-utils/debian/freebsd-ppp.manpages
trunk/freebsd-utils/debian/freebsd-utils-udeb.install
trunk/freebsd-utils/debian/freebsd-utils.install
trunk/freebsd-utils/debian/freebsd-utils.manpages
trunk/freebsd-utils/debian/geom.install
trunk/freebsd-utils/debian/geom.manpages
trunk/freebsd-utils/debian/kbdcontrol-udeb.install
trunk/freebsd-utils/debian/kbdcontrol.install
trunk/freebsd-utils/debian/kbdcontrol.manpages
trunk/freebsd-utils/debian/kldutils-udeb.install
trunk/freebsd-utils/debian/kldutils.install
trunk/freebsd-utils/debian/kldutils.manpages
trunk/freebsd-utils/debian/ktrace.install
trunk/freebsd-utils/debian/ktrace.manpages
trunk/freebsd-utils/debian/mkuzip.install
trunk/freebsd-utils/debian/mkuzip.manpages
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/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/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/021_netstat.diff
trunk/freebsd-utils/debian/patches/022_devd.diff
trunk/freebsd-utils/debian/patches/024_devfs.diff
trunk/freebsd-utils/debian/patches/026_kdump.diff
trunk/freebsd-utils/debian/patches/028_vidcontrol.diff
trunk/freebsd-utils/debian/patches/035_nfs.diff
trunk/freebsd-utils/debian/patches/039_geom.diff
trunk/freebsd-utils/debian/patches/041_delete_key.diff
trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff
trunk/freebsd-utils/debian/patches/ifconfig_nojail.diff
trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff
trunk/freebsd-utils/debian/patches/makefiles.diff
trunk/freebsd-utils/debian/patches/mount_cli_compat.diff
trunk/freebsd-utils/debian/patches/mount_n.diff
trunk/freebsd-utils/debian/patches/pf_regex_c.diff
trunk/freebsd-utils/debian/patches/pf_regex_followup.diff
trunk/freebsd-utils/debian/patches/powerd_no_cpufreq.diff
trunk/freebsd-utils/debian/patches/ppp_macros.diff
trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff
trunk/freebsd-utils/debian/patches/savecore_signal.diff
trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff
trunk/freebsd-utils/debian/pf.examples
trunk/freebsd-utils/debian/pf.install
trunk/freebsd-utils/debian/pf.manpages
trunk/freebsd-utils/debian/powerd.install
trunk/freebsd-utils/debian/powerd.manpages
trunk/freebsd-utils/debian/rules
trunk/freebsd-utils/debian/vidcontrol.install
trunk/freebsd-utils/debian/vidcontrol.manpages
Log:
* Split udeb build from normal build, using a separate objdir by means
of MAKEOBJDIRPREFIX. This allows us to:
- Optimize udeb build for size (-Os).
- Restrict -DWITHOUT_JAIL only to udeb build. This effectively brings
back jail support to ifconfig.
- As a side requirement, source code is moved to src/ directory to
prevent dh_install from mistakenly installing source directories as
if they were executable files.
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/changelog 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,7 +1,15 @@
-freebsd-utils (9.2-3) UNRELEASED; urgency=low
+freebsd-utils (9.2+ds1-1) UNRELEASED; urgency=low
* Drop freebsd-geom transitional package.
* Fetch source code securely (https) in get-orig-source.
+ * Split udeb build from normal build, using a separate objdir by means
+ of MAKEOBJDIRPREFIX. This allows us to:
+ - Optimize udeb build for size (-Os).
+ - Restrict -DWITHOUT_JAIL only to udeb build. This effectively brings
+ back jail support to ifconfig.
+ - As a side requirement, source code is moved to src/ directory to
+ prevent dh_install from mistakenly installing source directories as
+ if they were executable files.
-- Robert Millan <rmh at debian.org> Sun, 01 Dec 2013 20:31:39 +0100
Modified: trunk/freebsd-utils/debian/devd-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/devd-udeb.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/devd-udeb.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-sbin/devd/devd /sbin
-etc/devd.conf /etc
-etc/devd/usb.conf /etc/devd
+debian/tmp-udeb/sbin/devd /sbin
+src/etc/devd.conf /etc
+src/etc/devd/usb.conf /etc/devd
Modified: trunk/freebsd-utils/debian/devd.install
===================================================================
--- trunk/freebsd-utils/debian/devd.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/devd.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,4 +1,4 @@
-sbin/devd/devd /sbin
-etc/devd.conf /etc
-etc/devd/*.conf /etc/devd
+sbin/devd /sbin
+src/etc/devd.conf /etc
+src/etc/devd/*.conf /etc/devd
debian/local/devd/*.conf /etc/devd
Modified: trunk/freebsd-utils/debian/devd.manpages
===================================================================
--- trunk/freebsd-utils/debian/devd.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/devd.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1,2 @@
-sbin/devd/devd.8
-sbin/devd/devd.conf.5
+src/sbin/devd/devd.8
+src/sbin/devd/devd.conf.5
Modified: trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-net-tools-udeb.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-sbin/ifconfig/ifconfig /sbin
-sbin/route/route /sbin
+debian/tmp-udeb/sbin/ifconfig /sbin
+debian/tmp-udeb/sbin/route /sbin
debian/local/scripts/sbin/route /lib/freebsd
Modified: trunk/freebsd-utils/debian/freebsd-net-tools.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,6 @@
-etc/regdomain.xml /etc
-sbin/ifconfig/ifconfig /sbin
-sbin/route/route /sbin
+src/etc/regdomain.xml /etc
+sbin/ifconfig /sbin
+sbin/route /sbin
+usr/bin/netstat /usr/bin
debian/local/scripts/sbin/route /lib/freebsd
-usr.sbin/arp/arp /usr/sbin/
+usr/sbin/arp /usr/sbin
Modified: trunk/freebsd-utils/debian/freebsd-net-tools.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-net-tools.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-net-tools.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,4 +1,4 @@
-sbin/ifconfig/ifconfig.8
-sbin/route/route.8
-usr.bin/netstat/netstat.1
-usr.sbin/arp/arp.8
+src/sbin/ifconfig/ifconfig.8
+src/sbin/route/route.8
+src/usr.bin/netstat/netstat.1
+src/usr.sbin/arp/arp.8
Modified: trunk/freebsd-utils/debian/freebsd-nfs-common.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-common.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-nfs-common.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-usr.sbin/rpc.statd/rpc.statd /usr/sbin
-usr.sbin/rpc.lockd/rpc.lockd /usr/sbin
-sbin/nfsiod/nfsiod /sbin
+usr/sbin/rpc.statd /usr/sbin
+usr/sbin/rpc.lockd /usr/sbin
+sbin/nfsiod /sbin
Modified: trunk/freebsd-utils/debian/freebsd-nfs-common.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-common.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-nfs-common.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,4 +1,4 @@
-usr.sbin/rpc.statd/rpc.statd.8
-usr.sbin/rpc.lockd/rpc.lockd.8
-sbin/nfsiod/nfsiod.8
-usr.sbin/nfsd/nfsv4.4
+src/usr.sbin/rpc.statd/rpc.statd.8
+src/usr.sbin/rpc.lockd/rpc.lockd.8
+src/sbin/nfsiod/nfsiod.8
+src/usr.sbin/nfsd/nfsv4.4
Modified: trunk/freebsd-utils/debian/freebsd-nfs-server.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-server.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-nfs-server.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1,2 @@
-usr.sbin/mountd/mountd /usr/sbin
-usr.sbin/nfsd/nfsd /usr/sbin
+usr/sbin/mountd /usr/sbin
+usr/sbin/nfsd /usr/sbin
Modified: trunk/freebsd-utils/debian/freebsd-nfs-server.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-nfs-server.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-nfs-server.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,4 +1,4 @@
-usr.sbin/mountd/mountd.8
-usr.sbin/mountd/exports.5
-usr.sbin/mountd/netgroup.5
-usr.sbin/nfsd/nfsd.8
+src/usr.sbin/mountd/mountd.8
+src/usr.sbin/mountd/exports.5
+src/usr.sbin/mountd/netgroup.5
+src/usr.sbin/nfsd/nfsd.8
Modified: trunk/freebsd-utils/debian/freebsd-ppp.docs
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.docs 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-ppp.docs 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1,2 @@
-usr.sbin/ppp/README.changes
-usr.sbin/ppp/README.nat
+src/usr.sbin/ppp/README.changes
+src/usr.sbin/ppp/README.nat
Modified: trunk/freebsd-utils/debian/freebsd-ppp.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-ppp.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1,3 @@
-usr.sbin/ppp/ppp /usr/sbin/
-usr.sbin/pppctl/pppctl /usr/sbin/
+usr/sbin/ppp /usr/sbin/
+usr/sbin/pppctl /usr/sbin/
+usr/share/man/man8/ppp.8.gz
Modified: trunk/freebsd-utils/debian/freebsd-ppp.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-ppp.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-ppp.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1 @@
-usr.sbin/ppp/ppp.8
-usr.sbin/pppctl/pppctl.8
+src/usr.sbin/pppctl/pppctl.8
Modified: trunk/freebsd-utils/debian/freebsd-utils-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils-udeb.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-utils-udeb.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-bin/kenv/kenv /bin
-sbin/sysctl/sysctl /bin
-sbin/mdconfig/mdconfig /sbin
+debian/tmp-udeb/bin/kenv /bin
+debian/tmp-udeb/sbin/sysctl /bin
+debian/tmp-udeb/sbin/mdconfig /sbin
Modified: trunk/freebsd-utils/debian/freebsd-utils.install
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-utils.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,33 +1,33 @@
-bin/kenv/kenv /bin
+bin/kenv /bin
-sbin/mount/mount /bin
-sbin/umount/umount /lib/freebsd
-sbin/sysctl/sysctl /lib/freebsd
+sbin/mount /bin
+sbin/umount /lib/freebsd
+sbin/sysctl /lib/freebsd
debian/local/devfs.d/* /etc/devfs.d
debian/local/scripts/bin/sysctl /sbin
debian/local/scripts/sbin/umount /sbin
-sbin/dmesg/dmesg /bin
-sbin/dumpon/dumpon /sbin
-sbin/savecore/savecore /sbin
-sbin/swapon/swapon /sbin
-sbin/atacontrol/atacontrol /sbin
-sbin/camcontrol/camcontrol /sbin
-sbin/ccdconfig/ccdconfig /sbin
-sbin/mdconfig/mdconfig /sbin
-sbin/mount_std/mount_std /sbin
-sbin/mount_cd9660/mount_cd9660 /sbin
-sbin/mount_ext2fs/mount_ext2fs /sbin
-sbin/mount_hpfs/mount_hpfs /sbin
-sbin/mount_msdosfs/mount_msdosfs /sbin
-sbin/mount_nfs/mount_nfs /sbin
-sbin/mount_ntfs/mount_ntfs /sbin
-sbin/mount_nullfs/mount_nullfs /sbin
-sbin/mount_reiserfs/mount_reiserfs /sbin
-sbin/mount_udf/mount_udf /sbin
-sbin/mount_unionfs/mount_unionfs /sbin
-sbin/devfs/devfs /sbin
+sbin/dmesg /bin
+sbin/dumpon /sbin
+sbin/savecore /sbin
+sbin/swapon /sbin
+sbin/atacontrol /sbin
+sbin/camcontrol /sbin
+sbin/ccdconfig /sbin
+sbin/mdconfig /sbin
+sbin/mount_std /sbin
+sbin/mount_cd9660 /sbin
+sbin/mount_ext2fs /sbin
+sbin/mount_hpfs /sbin
+sbin/mount_msdosfs /sbin
+sbin/mount_nfs /sbin
+sbin/mount_ntfs /sbin
+sbin/mount_nullfs /sbin
+sbin/mount_reiserfs /sbin
+sbin/mount_udf /sbin
+sbin/mount_unionfs /sbin
+sbin/devfs /sbin
-usr.sbin/acpi/acpiconf/acpiconf /usr/sbin
-usr.sbin/jail/jail /usr/sbin
+usr/sbin/acpiconf /usr/sbin
+usr/sbin/jail /usr/sbin
Modified: trunk/freebsd-utils/debian/freebsd-utils.manpages
===================================================================
--- trunk/freebsd-utils/debian/freebsd-utils.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/freebsd-utils.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,26 +1,26 @@
-bin/kenv/kenv.1
-sbin/atacontrol/atacontrol.8
-sbin/camcontrol/camcontrol.8
-sbin/ccdconfig/ccdconfig.8
-sbin/devfs/devfs.8
-sbin/dmesg/dmesg.8
-sbin/dumpon/dumpon.8
-sbin/mdconfig/mdconfig.8
-sbin/mount_cd9660/mount_cd9660.8
-sbin/mount_ext2fs/mount_ext2fs.8
-sbin/mount_hpfs/mount_hpfs.8
-sbin/mount/mount.8
-sbin/mount_msdosfs/mount_msdosfs.8
-sbin/mount_nfs/mount_nfs.8
-sbin/mount_ntfs/mount_ntfs.8
-sbin/mount_nullfs/mount_nullfs.8
-sbin/mount_reiserfs/mount_reiserfs.8
-sbin/mount_std/mount_std.8
-sbin/mount_udf/mount_udf.8
-sbin/mount_unionfs/mount_unionfs.8
-sbin/savecore/savecore.8
-sbin/swapon/swapon.8
-sbin/sysctl/sysctl.8
-sbin/umount/umount.8
-usr.sbin/acpi/acpiconf/acpiconf.8
-usr.sbin/jail/jail.8
+src/bin/kenv/kenv.1
+src/sbin/atacontrol/atacontrol.8
+src/sbin/camcontrol/camcontrol.8
+src/sbin/ccdconfig/ccdconfig.8
+src/sbin/devfs/devfs.8
+src/sbin/dmesg/dmesg.8
+src/sbin/dumpon/dumpon.8
+src/sbin/mdconfig/mdconfig.8
+src/sbin/mount_cd9660/mount_cd9660.8
+src/sbin/mount_ext2fs/mount_ext2fs.8
+src/sbin/mount_hpfs/mount_hpfs.8
+src/sbin/mount/mount.8
+src/sbin/mount_msdosfs/mount_msdosfs.8
+src/sbin/mount_nfs/mount_nfs.8
+src/sbin/mount_ntfs/mount_ntfs.8
+src/sbin/mount_nullfs/mount_nullfs.8
+src/sbin/mount_reiserfs/mount_reiserfs.8
+src/sbin/mount_std/mount_std.8
+src/sbin/mount_udf/mount_udf.8
+src/sbin/mount_unionfs/mount_unionfs.8
+src/sbin/savecore/savecore.8
+src/sbin/swapon/swapon.8
+src/sbin/sysctl/sysctl.8
+src/sbin/umount/umount.8
+src/usr.sbin/acpi/acpiconf/acpiconf.8
+src/usr.sbin/jail/jail.8
Modified: trunk/freebsd-utils/debian/geom.install
===================================================================
--- trunk/freebsd-utils/debian/geom.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/geom.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,14 +1,3 @@
-sbin/geom/core/geom /sbin
-
-sbin/geom/class/cache/geom_cache.so /lib/geom
-sbin/geom/class/concat/geom_concat.so /lib/geom
-sbin/geom/class/eli/geom_eli.so /lib/geom
-sbin/geom/class/label/geom_label.so /lib/geom
-sbin/geom/class/mirror/geom_mirror.so /lib/geom
-sbin/geom/class/nop/geom_nop.so /lib/geom
-sbin/geom/class/raid3/geom_raid3.so /lib/geom
-sbin/geom/class/sched/geom_sched.so /lib/geom
-sbin/geom/class/shsec/geom_shsec.so /lib/geom
-sbin/geom/class/stripe/geom_stripe.so /lib/geom
-
+sbin/geom /sbin
+lib/geom /lib
debian/local/default/geli /etc/default
Modified: trunk/freebsd-utils/debian/geom.manpages
===================================================================
--- trunk/freebsd-utils/debian/geom.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/geom.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,15 +1,15 @@
-sbin/geom/core/geom.8
-sbin/geom/class/cache/gcache.8
-sbin/geom/class/concat/gconcat.8
-sbin/geom/class/eli/geli.8
-sbin/geom/class/journal/gjournal.8
-sbin/geom/class/label/glabel.8
-sbin/geom/class/mirror/gmirror.8
-sbin/geom/class/multipath/gmultipath.8
-sbin/geom/class/nop/gnop.8
-sbin/geom/class/part/gpart.8
-sbin/geom/class/raid3/graid3.8
-sbin/geom/class/sched/gsched.8
-sbin/geom/class/shsec/gshsec.8
-sbin/geom/class/stripe/gstripe.8
-sbin/geom/class/virstor/gvirstor.8
+src/sbin/geom/core/geom.8
+src/sbin/geom/class/cache/gcache.8
+src/sbin/geom/class/concat/gconcat.8
+src/sbin/geom/class/eli/geli.8
+src/sbin/geom/class/journal/gjournal.8
+src/sbin/geom/class/label/glabel.8
+src/sbin/geom/class/mirror/gmirror.8
+src/sbin/geom/class/multipath/gmultipath.8
+src/sbin/geom/class/nop/gnop.8
+src/sbin/geom/class/part/gpart.8
+src/sbin/geom/class/raid3/graid3.8
+src/sbin/geom/class/sched/gsched.8
+src/sbin/geom/class/shsec/gshsec.8
+src/sbin/geom/class/stripe/gstripe.8
+src/sbin/geom/class/virstor/gvirstor.8
Modified: trunk/freebsd-utils/debian/kbdcontrol-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol-udeb.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/kbdcontrol-udeb.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-usr.sbin/kbdcontrol/kbdcontrol /bin
-share/syscons/keymaps/*.kbd /usr/share/syscons/keymaps
+debian/tmp-udeb/usr/sbin/kbdcontrol /sbin
+src/share/syscons/keymaps/*.kbd /usr/share/syscons/keymaps
debian/local/keymaps/*.kbd /usr/share/syscons/keymaps
Modified: trunk/freebsd-utils/debian/kbdcontrol.install
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/kbdcontrol.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-usr.sbin/kbdcontrol/kbdcontrol /bin
-share/syscons/keymaps/*.kbd /usr/share/syscons/keymaps
+usr/sbin/kbdcontrol /sbin
+src/share/syscons/keymaps/*.kbd /usr/share/syscons/keymaps
debian/local/keymaps/*.kbd /usr/share/syscons/keymaps
Modified: trunk/freebsd-utils/debian/kbdcontrol.manpages
===================================================================
--- trunk/freebsd-utils/debian/kbdcontrol.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/kbdcontrol.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1,2 @@
-usr.sbin/kbdcontrol/*.1
-usr.sbin/kbdcontrol/*.5
+src/usr.sbin/kbdcontrol/*.1
+src/usr.sbin/kbdcontrol/*.5
Modified: trunk/freebsd-utils/debian/kldutils-udeb.install
===================================================================
--- trunk/freebsd-utils/debian/kldutils-udeb.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/kldutils-udeb.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-sbin/kldload/kldload /sbin
-sbin/kldunload/kldunload /sbin
-sbin/kldstat/kldstat /bin
+debian/tmp-udeb/sbin/kldload /sbin
+debian/tmp-udeb/sbin/kldunload /sbin
+debian/tmp-udeb/sbin/kldstat /bin
Modified: trunk/freebsd-utils/debian/kldutils.install
===================================================================
--- trunk/freebsd-utils/debian/kldutils.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/kldutils.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
-sbin/kldload/kldload /sbin
-sbin/kldunload/kldunload /sbin
-sbin/kldconfig/kldconfig /sbin
-sbin/kldstat/kldstat /bin
-debian/modules /etc
+sbin/kldload /sbin
+sbin/kldunload /sbin
+sbin/kldconfig /sbin
+sbin/kldstat /bin
+debian/modules /etc
Modified: trunk/freebsd-utils/debian/kldutils.manpages
===================================================================
--- trunk/freebsd-utils/debian/kldutils.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/kldutils.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,4 +1,4 @@
-sbin/kldload/kldload.8
-sbin/kldstat/kldstat.8
-sbin/kldunload/kldunload.8
-sbin/kldconfig/kldconfig.8
+src/sbin/kldload/kldload.8
+src/sbin/kldstat/kldstat.8
+src/sbin/kldunload/kldunload.8
+src/sbin/kldconfig/kldconfig.8
Modified: trunk/freebsd-utils/debian/ktrace.install
===================================================================
--- trunk/freebsd-utils/debian/ktrace.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/ktrace.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1,2 @@
-usr.bin/ktrace/ktrace /usr/bin
-usr.bin/kdump/kdump /usr/bin
+usr/bin/ktrace /usr/bin
+usr/bin/kdump /usr/bin
Modified: trunk/freebsd-utils/debian/ktrace.manpages
===================================================================
--- trunk/freebsd-utils/debian/ktrace.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/ktrace.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,2 +1,2 @@
-usr.bin/ktrace/ktrace.1
-usr.bin/kdump/kdump.1
+src/usr.bin/ktrace/ktrace.1
+src/usr.bin/kdump/kdump.1
Modified: trunk/freebsd-utils/debian/mkuzip.install
===================================================================
--- trunk/freebsd-utils/debian/mkuzip.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/mkuzip.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1 +1 @@
-usr.bin/mkuzip/mkuzip /usr/bin
+usr/bin/mkuzip /usr/bin
Modified: trunk/freebsd-utils/debian/mkuzip.manpages
===================================================================
--- trunk/freebsd-utils/debian/mkuzip.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/mkuzip.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1 +1 @@
-usr.bin/mkuzip/mkuzip.8
+src/usr.bin/mkuzip/mkuzip.8
Modified: trunk/freebsd-utils/debian/patches/001_dmesg.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/001_dmesg.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/001_dmesg.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -3,8 +3,8 @@
sbin/dmesg/dmesg.c | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---- a/sbin/dmesg/dmesg.c
-+++ b/sbin/dmesg/dmesg.c
+--- a/src/sbin/dmesg/dmesg.c
++++ b/src/sbin/dmesg/dmesg.c
@@ -68,7 +68,7 @@
{ NULL, 0, 0, 0, 0 },
};
@@ -33,8 +33,8 @@
case '?':
default:
usage();
---- a/sbin/dmesg/Makefile
-+++ b/sbin/dmesg/Makefile
+--- a/src/sbin/dmesg/Makefile
++++ b/src/sbin/dmesg/Makefile
@@ -4,7 +4,7 @@
PROG= dmesg
MAN= dmesg.8
Modified: trunk/freebsd-utils/debian/patches/002_ifconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/002_ifconfig.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/ifconfig/Makefile
-+++ b/sbin/ifconfig/Makefile
+--- a/src/sbin/ifconfig/Makefile
++++ b/src/sbin/ifconfig/Makefile
@@ -36,7 +36,7 @@
SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
@@ -9,8 +9,8 @@
SRCS+= ifcarp.c # SIOC[GS]VH support
SRCS+= ifgroup.c # ...
---- a/sbin/ifconfig/ifconfig.c
-+++ b/sbin/ifconfig/ifconfig.c
+--- a/src/sbin/ifconfig/ifconfig.c
++++ b/src/sbin/ifconfig/ifconfig.c
@@ -76,6 +76,13 @@
#include "ifconfig.h"
Modified: trunk/freebsd-utils/debian/patches/003_kbdcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/003_kbdcontrol.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/003_kbdcontrol.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,8 +2,8 @@
usr.sbin/kbdcontrol/kbdcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/usr.sbin/kbdcontrol/kbdcontrol.c
-+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
+--- a/src/usr.sbin/kbdcontrol/kbdcontrol.c
++++ b/src/usr.sbin/kbdcontrol/kbdcontrol.c
@@ -138,7 +138,7 @@
void set_keyboard(char *device);
void set_keyrates(char *opt);
Modified: trunk/freebsd-utils/debian/patches/004_kldconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/004_kldconfig.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/004_kldconfig.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/kldconfig/Makefile
-+++ b/sbin/kldconfig/Makefile
+--- a/src/sbin/kldconfig/Makefile
++++ b/src/sbin/kldconfig/Makefile
@@ -29,4 +29,6 @@
PROG= kldconfig
MAN= kldconfig.8
@@ -7,8 +7,8 @@
+LDADD= -lbsd
+
.include <bsd.prog.mk>
---- a/sbin/kldload/Makefile
-+++ b/sbin/kldload/Makefile
+--- a/src/sbin/kldload/Makefile
++++ b/src/sbin/kldload/Makefile
@@ -29,4 +29,6 @@
PROG= kldload
MAN= kldload.8
@@ -16,8 +16,8 @@
+LDADD= -lbsd
+
.include <bsd.prog.mk>
---- a/sbin/kldunload/Makefile
-+++ b/sbin/kldunload/Makefile
+--- a/src/sbin/kldunload/Makefile
++++ b/src/sbin/kldunload/Makefile
@@ -29,4 +29,6 @@
PROG= kldunload
MAN= kldunload.8
Modified: trunk/freebsd-utils/debian/patches/006_mdconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/006_mdconfig.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/006_mdconfig.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -7,8 +7,8 @@
sbin/mdconfig/mdconfig.c | 23 ++++++++++++++++++++---
2 files changed, 21 insertions(+), 4 deletions(-)
---- a/sbin/mdconfig/mdconfig.c
-+++ b/sbin/mdconfig/mdconfig.c
+--- a/src/sbin/mdconfig/mdconfig.c
++++ b/src/sbin/mdconfig/mdconfig.c
@@ -74,6 +74,24 @@
#define CLASS_NAME_MD "MD"
Modified: trunk/freebsd-utils/debian/patches/007_mount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/007_mount.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/007_mount.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/mount/mount.c
-+++ b/sbin/mount/mount.c
+--- a/src/sbin/mount/mount.c
++++ b/src/sbin/mount/mount.c
@@ -662,11 +662,13 @@
(void)printf(", reads: sync %ju async %ju",
(uintmax_t)sfp->f_syncreads,
Modified: trunk/freebsd-utils/debian/patches/008_mount_hpfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/008_mount_hpfs.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/008_mount_hpfs.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,8 +2,8 @@
sbin/mount_hpfs/mount_hpfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/sbin/mount_hpfs/mount_hpfs.c
-+++ b/sbin/mount_hpfs/mount_hpfs.c
+--- a/src/sbin/mount_hpfs/mount_hpfs.c
++++ b/src/sbin/mount_hpfs/mount_hpfs.c
@@ -56,7 +56,7 @@
static gid_t a_gid(char *);
static uid_t a_uid(char *);
Modified: trunk/freebsd-utils/debian/patches/009_mount_msdosfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/009_mount_msdosfs.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/009_mount_msdosfs.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,8 +2,8 @@
sbin/mount_msdosfs/mount_msdosfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- a/sbin/mount_msdosfs/mount_msdosfs.c
-+++ b/sbin/mount_msdosfs/mount_msdosfs.c
+--- a/src/sbin/mount_msdosfs/mount_msdosfs.c
++++ b/src/sbin/mount_msdosfs/mount_msdosfs.c
@@ -49,7 +49,7 @@
#include <pwd.h>
#include <stdio.h>
Modified: trunk/freebsd-utils/debian/patches/010_mount_ntfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/010_mount_ntfs.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/010_mount_ntfs.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,8 +2,8 @@
sbin/mount_ntfs/mount_ntfs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- a/sbin/mount_ntfs/mount_ntfs.c
-+++ b/sbin/mount_ntfs/mount_ntfs.c
+--- a/src/sbin/mount_ntfs/mount_ntfs.c
++++ b/src/sbin/mount_ntfs/mount_ntfs.c
@@ -38,6 +38,7 @@
#include <sys/mount.h>
#include <sys/stat.h>
Modified: trunk/freebsd-utils/debian/patches/011_mount_nullfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/011_mount_nullfs.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/011_mount_nullfs.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,8 +2,8 @@
sbin/mount_nullfs/mount_nullfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/sbin/mount_nullfs/mount_nullfs.c
-+++ b/sbin/mount_nullfs/mount_nullfs.c
+--- a/src/sbin/mount_nullfs/mount_nullfs.c
++++ b/src/sbin/mount_nullfs/mount_nullfs.c
@@ -58,7 +58,7 @@
#include "mntopts.h"
Modified: trunk/freebsd-utils/debian/patches/013_pf.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/013_pf.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/013_pf.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/contrib/pf/authpf/authpf.c
-+++ b/contrib/pf/authpf/authpf.c
+--- a/src/contrib/pf/authpf/authpf.c
++++ b/src/contrib/pf/authpf/authpf.c
@@ -37,7 +37,7 @@
#if 1
#include <inttypes.h>
@@ -63,8 +63,8 @@
} else if (buf[0] == '%') {
/* check group membership */
int cnt;
---- a/contrib/pf/ftp-proxy/ftp-proxy.c
-+++ b/contrib/pf/ftp-proxy/ftp-proxy.c
+--- a/src/contrib/pf/ftp-proxy/ftp-proxy.c
++++ b/src/contrib/pf/ftp-proxy/ftp-proxy.c
@@ -104,7 +104,7 @@
int drop_privs(void);
void end_session(struct session *);
@@ -101,8 +101,8 @@
logmsg(LOG_DEBUG, "#%d server: %s", s->id, linebuf);
if (!server_parse(s)) {
end_session(s);
---- a/contrib/pf/pfctl/parse.y
-+++ b/contrib/pf/pfctl/parse.y
+--- a/src/contrib/pf/pfctl/parse.y
++++ b/src/contrib/pf/pfctl/parse.y
@@ -427,6 +427,7 @@
} v;
int lineno;
@@ -111,8 +111,8 @@
#define PPORT_RANGE 1
#define PPORT_STAR 2
---- a/contrib/pf/pfctl/pfctl.h
-+++ b/contrib/pf/pfctl/pfctl.h
+--- a/src/contrib/pf/pfctl/pfctl.h
++++ b/src/contrib/pf/pfctl/pfctl.h
@@ -36,6 +36,12 @@
enum pfctl_show { PFCTL_SHOW_RULES, PFCTL_SHOW_LABELS, PFCTL_SHOW_NOTHING };
@@ -126,8 +126,8 @@
enum { PFRB_TABLES = 1, PFRB_TSTATS, PFRB_ADDRS, PFRB_ASTATS,
PFRB_IFACES, PFRB_TRANS, PFRB_MAX };
struct pfr_buffer {
---- a/contrib/pf/pfctl/pfctl_parser.c
-+++ b/contrib/pf/pfctl/pfctl_parser.c
+--- a/src/contrib/pf/pfctl/pfctl_parser.c
++++ b/src/contrib/pf/pfctl/pfctl_parser.c
@@ -59,6 +59,28 @@
#include <ifaddrs.h>
#include <unistd.h>
Modified: trunk/freebsd-utils/debian/patches/014_route.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/014_route.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/014_route.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/route/route.c
-+++ b/sbin/route/route.c
+--- a/src/sbin/route/route.c
++++ b/src/sbin/route/route.c
@@ -167,7 +167,7 @@
if (argc < 2)
usage(NULL);
Modified: trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/015_rpc.umntall.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,8 +2,8 @@
usr.sbin/rpc.umntall/rpc.umntall.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---- a/usr.sbin/rpc.umntall/rpc.umntall.c
-+++ b/usr.sbin/rpc.umntall/rpc.umntall.c
+--- a/src/usr.sbin/rpc.umntall/rpc.umntall.c
++++ b/src/usr.sbin/rpc.umntall/rpc.umntall.c
@@ -176,8 +176,7 @@
try.tv_sec = 3;
Modified: trunk/freebsd-utils/debian/patches/016_swapon.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/016_swapon.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/016_swapon.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -7,8 +7,8 @@
sbin/swapon/swapon.c | 13 +++++++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
---- a/sbin/swapon/swapon.c
-+++ b/sbin/swapon/swapon.c
+--- a/src/sbin/swapon/swapon.c
++++ b/src/sbin/swapon/swapon.c
@@ -41,6 +41,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
Modified: trunk/freebsd-utils/debian/patches/017_sysctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/017_sysctl.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/017_sysctl.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,8 +2,8 @@
sbin/sysctl/sysctl.c | 3 +++
1 file changed, 3 insertions(+)
---- a/sbin/sysctl/sysctl.c
-+++ b/sbin/sysctl/sysctl.c
+--- a/src/sbin/sysctl/sysctl.c
++++ b/src/sbin/sysctl/sysctl.c
@@ -57,6 +57,7 @@
#include <stdlib.h>
#include <string.h>
Modified: trunk/freebsd-utils/debian/patches/018_umount.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/018_umount.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/018_umount.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/umount/umount.c
-+++ b/sbin/umount/umount.c
+--- a/src/sbin/umount/umount.c
++++ b/src/sbin/umount/umount.c
@@ -401,7 +401,7 @@
free(orignfsdirname);
return (1);
Modified: trunk/freebsd-utils/debian/patches/021_netstat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/021_netstat.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/021_netstat.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/usr.bin/netstat/netgraph.c
-+++ b/usr.bin/netstat/netgraph.c
+--- a/src/usr.bin/netstat/netgraph.c
++++ b/src/usr.bin/netstat/netgraph.c
@@ -76,8 +76,8 @@
const char *const modname = "ng_socket.ko";
/* XXX We should get "mpath" from "sysctl kern.module_path" */
@@ -11,8 +11,8 @@
const char **pre;
struct kld_file_stat ks;
int fileid;
---- a/usr.bin/netstat/netstat.h
-+++ b/usr.bin/netstat/netstat.h
+--- a/src/usr.bin/netstat/netstat.h
++++ b/src/usr.bin/netstat/netstat.h
@@ -32,6 +32,19 @@
#include <sys/cdefs.h>
Modified: trunk/freebsd-utils/debian/patches/022_devd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/022_devd.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/022_devd.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/devd/parse.y
-+++ b/sbin/devd/parse.y
+--- a/src/sbin/devd/parse.y
++++ b/src/sbin/devd/parse.y
@@ -29,9 +29,9 @@
* $FreeBSD$
*/
@@ -11,8 +11,8 @@
%}
---- a/etc/devd.conf
-+++ b/etc/devd.conf
+--- a/src/etc/devd.conf
++++ b/src/etc/devd.conf
@@ -1,8 +1,5 @@
-# $FreeBSD$
-#
Modified: trunk/freebsd-utils/debian/patches/024_devfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/024_devfs.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/024_devfs.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/devfs/extern.h
-+++ b/sbin/devfs/extern.h
+--- a/src/sbin/devfs/extern.h
++++ b/src/sbin/devfs/extern.h
@@ -50,7 +50,7 @@
uint16_t eatonum(const char *);
size_t efgetln(FILE *, char **);
@@ -9,8 +9,8 @@
extern int mpfd; /* Mount-point file descriptor. */
---- a/sbin/devfs/Makefile
-+++ b/sbin/devfs/Makefile
+--- a/src/sbin/devfs/Makefile
++++ b/src/sbin/devfs/Makefile
@@ -3,5 +3,6 @@
PROG= devfs
SRCS= devfs.c rule.c
@@ -18,8 +18,8 @@
+LDADD+= -lbsd
.include <bsd.prog.mk>
---- a/sbin/devfs/rule.c
-+++ b/sbin/devfs/rule.c
+--- a/src/sbin/devfs/rule.c
++++ b/src/sbin/devfs/rule.c
@@ -85,8 +85,8 @@
int ch;
@@ -31,8 +31,8 @@
switch (ch) {
case 's':
in_rsnum = eatonum(optarg);
---- a/sbin/devfs/devfs.c
-+++ b/sbin/devfs/devfs.c
+--- a/src/sbin/devfs/devfs.c
++++ b/src/sbin/devfs/devfs.c
@@ -62,7 +62,7 @@
int ch;
Modified: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -5,8 +5,8 @@
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
+--- a/src/usr.bin/kdump/kdump.c
++++ b/src/usr.bin/kdump/kdump.c
@@ -55,6 +55,7 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -51,8 +51,8 @@
{
char mode[12], timestr[PATH_MAX + 4];
struct passwd *pwd;
---- a/usr.bin/kdump/Makefile
-+++ b/usr.bin/kdump/Makefile
+--- a/src/usr.bin/kdump/Makefile
++++ b/src/usr.bin/kdump/Makefile
@@ -10,6 +10,7 @@
PROG= kdump
SRCS= kdump.c ioctl.c kdump_subr.c subr.c
@@ -74,8 +74,8 @@
linux_syscalls.c:
/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
---- a/usr.bin/kdump/mksubr
-+++ b/usr.bin/kdump/mksubr
+--- a/src/usr.bin/kdump/mksubr
++++ b/src/usr.bin/kdump/mksubr
@@ -50,7 +50,7 @@
echo "usage: sh $0 include-dir"
exit 1
@@ -271,7 +271,7 @@
if ($i ~ /define/) \
break; \
--- /dev/null
-+++ b/usr.bin/kdump/stat16.h
++++ b/src/usr.bin/kdump/stat16.h
@@ -0,0 +1,55 @@
+/* Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -328,8 +328,8 @@
+#define _BIRTH_PADSIZE (2*(8 - sizeof (long)))
+ char __birth_padding[_BIRTH_PADSIZE];
+ };
---- a/usr.bin/kdump/mkioctls
-+++ b/usr.bin/kdump/mkioctls
+--- a/src/usr.bin/kdump/mkioctls
++++ b/src/usr.bin/kdump/mkioctls
@@ -15,21 +15,23 @@
echo "usage: sh $0 [-s] include-dir"
exit 1
Modified: trunk/freebsd-utils/debian/patches/028_vidcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/028_vidcontrol.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/028_vidcontrol.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -3,8 +3,8 @@
usr.sbin/vidcontrol/vidcontrol.c | 1 +
2 files changed, 2 insertions(+)
---- a/usr.sbin/vidcontrol/Makefile
-+++ b/usr.sbin/vidcontrol/Makefile
+--- a/src/usr.sbin/vidcontrol/Makefile
++++ b/src/usr.sbin/vidcontrol/Makefile
@@ -2,5 +2,6 @@
PROG= vidcontrol
Modified: trunk/freebsd-utils/debian/patches/035_nfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/035_nfs.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/035_nfs.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/mount_nfs/mount_nfs.c
-+++ b/sbin/mount_nfs/mount_nfs.c
+--- a/src/sbin/mount_nfs/mount_nfs.c
++++ b/src/sbin/mount_nfs/mount_nfs.c
@@ -668,12 +668,18 @@
static int
sec_name_to_num(char *sec)
@@ -50,8 +50,8 @@
return (1);
}
---- a/usr.sbin/mountd/mountd.c
-+++ b/usr.sbin/mountd/mountd.c
+--- a/src/usr.sbin/mountd/mountd.c
++++ b/src/usr.sbin/mountd/mountd.c
@@ -2118,12 +2118,18 @@
if (!strcmp(seclist, "sys"))
@@ -71,8 +71,8 @@
else {
if (cp)
*cp = savedc;
---- a/usr.sbin/rpc.lockd/lockd.c
-+++ b/usr.sbin/rpc.lockd/lockd.c
+--- a/src/usr.sbin/rpc.lockd/lockd.c
++++ b/src/usr.sbin/rpc.lockd/lockd.c
@@ -997,7 +997,7 @@
ret = callrpc("localhost", SM_PROG, SM_VERS, SM_UNMON_ALL,
(xdrproc_t)xdr_my_id, &id, (xdrproc_t)xdr_sm_stat, &stat);
@@ -91,8 +91,8 @@
exit(1);
}
---- a/usr.sbin/rpc.lockd/kern.c
-+++ b/usr.sbin/rpc.lockd/kern.c
+--- a/src/usr.sbin/rpc.lockd/kern.c
++++ b/src/usr.sbin/rpc.lockd/kern.c
@@ -52,7 +52,8 @@
#include <unistd.h>
#include <netdb.h>
@@ -103,8 +103,8 @@
#include <nfs/nfsproto.h>
#include <nfs/nfs_lock.h>
---- a/usr.sbin/rpc.statd/statd.c
-+++ b/usr.sbin/rpc.statd/statd.c
+--- a/src/usr.sbin/rpc.statd/statd.c
++++ b/src/usr.sbin/rpc.statd/statd.c
@@ -58,6 +58,8 @@
#define GETPORT_MAXTRY 20 /* Max tries to get a port # */
@@ -123,8 +123,8 @@
/* Note that it is NOT sensible to run this program from inetd - the */
/* protocol assumes that it will run immediately at boot time. */
---- a/usr.sbin/rpc.statd/rpc.statd.8
-+++ b/usr.sbin/rpc.statd/rpc.statd.8
+--- a/src/usr.sbin/rpc.statd/rpc.statd.8
++++ b/src/usr.sbin/rpc.statd/rpc.statd.8
@@ -110,7 +110,7 @@
after the network has been started.
.Sh FILES
@@ -134,8 +134,8 @@
non-volatile record of currently monitored hosts.
.It Pa /usr/include/rpcsvc/sm_inter.x
RPC protocol specification used by local applications to register monitoring requests.
---- a/usr.sbin/rpc.statd/Makefile
-+++ b/usr.sbin/rpc.statd/Makefile
+--- a/src/usr.sbin/rpc.statd/Makefile
++++ b/src/usr.sbin/rpc.statd/Makefile
@@ -8,16 +8,21 @@
WARNS?= 2
Modified: trunk/freebsd-utils/debian/patches/039_geom.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/039_geom.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/039_geom.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/geom/misc/subr.c
-+++ b/sbin/geom/misc/subr.c
+--- a/src/sbin/geom/misc/subr.c
++++ b/src/sbin/geom/misc/subr.c
@@ -177,7 +177,7 @@
if (*s != '\0')
return (EINVAL);
@@ -9,8 +9,8 @@
return (ERANGE);
number *= mult * unit;
if (number % sectorsize)
---- a/sys/crypto/sha2/sha2.c
-+++ b/sys/crypto/sha2/sha2.c
+--- a/src/sys/crypto/sha2/sha2.c
++++ b/src/sys/crypto/sha2/sha2.c
@@ -67,8 +67,10 @@
*
*/
Modified: trunk/freebsd-utils/debian/patches/041_delete_key.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/041_delete_key.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/041_delete_key.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/share/syscons/keymaps/us.iso.kbd
-+++ b/share/syscons/keymaps/us.iso.kbd
+--- a/src/share/syscons/keymaps/us.iso.kbd
++++ b/src/share/syscons/keymaps/us.iso.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -18,8 +18,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/ua.koi8-u.kbd
-+++ b/share/syscons/keymaps/ua.koi8-u.kbd
+--- a/src/share/syscons/keymaps/ua.koi8-u.kbd
++++ b/src/share/syscons/keymaps/ua.koi8-u.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' '%' nop nop O
012 '-' '_' ns ns '-' '_' ns ns O
@@ -47,8 +47,8 @@
104 slock slock slock slock slock slock slock slock O
105 meta fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O
106 meta fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
---- a/share/syscons/keymaps/by.cp1131.kbd
-+++ b/share/syscons/keymaps/by.cp1131.kbd
+--- a/src/share/syscons/keymaps/by.cp1131.kbd
++++ b/src/share/syscons/keymaps/by.cp1131.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -67,8 +67,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/kk.pt154.kst.kbd
-+++ b/share/syscons/keymaps/kk.pt154.kst.kbd
+--- a/src/share/syscons/keymaps/kk.pt154.kst.kbd
++++ b/src/share/syscons/keymaps/kk.pt154.kst.kbd
@@ -19,7 +19,7 @@
011 '0' ')' nop nop 176 169 nop nop O
012 '-' '_' us us 173 223 159 159 O
@@ -87,8 +87,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/ua.iso5.kbd
-+++ b/share/syscons/keymaps/ua.iso5.kbd
+--- a/src/share/syscons/keymaps/ua.iso5.kbd
++++ b/src/share/syscons/keymaps/ua.iso5.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' '%' nop nop O
012 '-' '_' ns ns '-' '_' ns ns O
@@ -116,8 +116,8 @@
104 slock saver slock saver susp nop susp nop O
105 meta fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O
106 meta fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
---- a/share/syscons/keymaps/danish.iso.acc.kbd
-+++ b/share/syscons/keymaps/danish.iso.acc.kbd
+--- a/src/share/syscons/keymaps/danish.iso.acc.kbd
++++ b/src/share/syscons/keymaps/danish.iso.acc.kbd
@@ -42,7 +42,7 @@
011 '0' '=' nop nop '}' '=' nop nop O
012 '+' '?' nop nop '+' 191 nop nop O
@@ -136,8 +136,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs '\' '>' fs fs O
---- a/share/syscons/keymaps/by.cp1251.kbd
-+++ b/share/syscons/keymaps/by.cp1251.kbd
+--- a/src/share/syscons/keymaps/by.cp1251.kbd
++++ b/src/share/syscons/keymaps/by.cp1251.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -156,8 +156,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/dutch.iso.acc.kbd
-+++ b/share/syscons/keymaps/dutch.iso.acc.kbd
+--- a/src/share/syscons/keymaps/dutch.iso.acc.kbd
++++ b/src/share/syscons/keymaps/dutch.iso.acc.kbd
@@ -24,7 +24,7 @@
011 '0' ''' nop nop 191 ')' nop nop O
012 '/' '?' us us '\' '?' us us O
@@ -176,8 +176,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 ']' '[' nop nop 124 124 nop nop O
---- a/share/syscons/keymaps/latinamerican.iso.acc.kbd
-+++ b/share/syscons/keymaps/latinamerican.iso.acc.kbd
+--- a/src/share/syscons/keymaps/latinamerican.iso.acc.kbd
++++ b/src/share/syscons/keymaps/latinamerican.iso.acc.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' nop nop '\' '\' nop nop O
@@ -196,8 +196,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs '\' '>' fs fs O
---- a/share/syscons/keymaps/kk.pt154.io.kbd
-+++ b/share/syscons/keymaps/kk.pt154.io.kbd
+--- a/src/share/syscons/keymaps/kk.pt154.io.kbd
++++ b/src/share/syscons/keymaps/kk.pt154.io.kbd
@@ -19,7 +19,7 @@
011 '0' ')' nop nop 176 169 nop nop O
012 '-' '_' us us 173 223 159 159 O
@@ -216,8 +216,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/spanish.iso15.acc.kbd
-+++ b/share/syscons/keymaps/spanish.iso15.acc.kbd
+--- a/src/share/syscons/keymaps/spanish.iso15.acc.kbd
++++ b/src/share/syscons/keymaps/spanish.iso15.acc.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' nop nop ''' '?' nop nop O
@@ -236,8 +236,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '<' '>' nop nop O
---- a/share/syscons/keymaps/icelandic.iso.acc.kbd
-+++ b/share/syscons/keymaps/icelandic.iso.acc.kbd
+--- a/src/share/syscons/keymaps/icelandic.iso.acc.kbd
++++ b/src/share/syscons/keymaps/icelandic.iso.acc.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' nop nop nop O
012 246 214 nop nop '\' nop fs nop C
@@ -256,8 +256,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/us.pc-ctrl.kbd
-+++ b/share/syscons/keymaps/us.pc-ctrl.kbd
+--- a/src/share/syscons/keymaps/us.pc-ctrl.kbd
++++ b/src/share/syscons/keymaps/us.pc-ctrl.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -276,8 +276,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/br275.iso.kbd
-+++ b/share/syscons/keymaps/br275.iso.kbd
+--- a/src/share/syscons/keymaps/br275.iso.kbd
++++ b/src/share/syscons/keymaps/br275.iso.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -296,8 +296,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/swissfrench.cp850.kbd
-+++ b/share/syscons/keymaps/swissfrench.cp850.kbd
+--- a/src/share/syscons/keymaps/swissfrench.cp850.kbd
++++ b/src/share/syscons/keymaps/swissfrench.cp850.kbd
@@ -21,7 +21,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' fs fs ''' ''' fs fs O
@@ -316,8 +316,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '\' '\' nop nop O
---- a/share/syscons/keymaps/eee_nordic.kbd
-+++ b/share/syscons/keymaps/eee_nordic.kbd
+--- a/src/share/syscons/keymaps/eee_nordic.kbd
++++ b/src/share/syscons/keymaps/eee_nordic.kbd
@@ -19,7 +19,7 @@
012 '+' '?' nop nop '\' nop fs nop O
# For left of backspace key, gives with Alt=' and Alt+Shift+Key=|
@@ -336,8 +336,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/estonian.cp850.kbd
-+++ b/share/syscons/keymaps/estonian.cp850.kbd
+--- a/src/share/syscons/keymaps/estonian.cp850.kbd
++++ b/src/share/syscons/keymaps/estonian.cp850.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '}' nop nop O
012 '+' '?' fs fs '\' '\' fs fs O
@@ -356,8 +356,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' '|' nop nop O
---- a/share/syscons/keymaps/ru.koi8-r.kbd
-+++ b/share/syscons/keymaps/ru.koi8-r.kbd
+--- a/src/share/syscons/keymaps/ru.koi8-r.kbd
++++ b/src/share/syscons/keymaps/ru.koi8-r.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop 176 169 nop nop O
012 '-' '_' us us 173 223 159 159 O
@@ -376,8 +376,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/spanish.iso.kbd
-+++ b/share/syscons/keymaps/spanish.iso.kbd
+--- a/src/share/syscons/keymaps/spanish.iso.kbd
++++ b/src/share/syscons/keymaps/spanish.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' nop nop ''' '?' nop nop O
@@ -396,8 +396,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '<' '>' nop nop O
---- a/share/syscons/keymaps/fr.iso.kbd
-+++ b/share/syscons/keymaps/fr.iso.kbd
+--- a/src/share/syscons/keymaps/fr.iso.kbd
++++ b/src/share/syscons/keymaps/fr.iso.kbd
@@ -17,7 +17,7 @@
011 224 '0' nop nop '@' nop nop nop C
012 ')' 176 nop nop ']' nop nop nop C
@@ -416,8 +416,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs 171 187 fs fs O
---- a/share/syscons/keymaps/swissgerman.cp850.kbd
-+++ b/share/syscons/keymaps/swissgerman.cp850.kbd
+--- a/src/share/syscons/keymaps/swissgerman.cp850.kbd
++++ b/src/share/syscons/keymaps/swissgerman.cp850.kbd
@@ -21,7 +21,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' fs fs ''' ''' fs fs O
@@ -436,8 +436,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '\' '\' nop nop O
---- a/share/syscons/keymaps/pt.iso.acc.kbd
-+++ b/share/syscons/keymaps/pt.iso.acc.kbd
+--- a/src/share/syscons/keymaps/pt.iso.acc.kbd
++++ b/src/share/syscons/keymaps/pt.iso.acc.kbd
@@ -19,7 +19,7 @@
011 '0' '=' nop nop '}' ')' nop nop O
012 ''' '?' ns ns '-' '_' ns ns O
@@ -456,8 +456,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop nop nop nop nop O
---- a/share/syscons/keymaps/swedish.cp850.kbd
-+++ b/share/syscons/keymaps/swedish.cp850.kbd
+--- a/src/share/syscons/keymaps/swedish.cp850.kbd
++++ b/src/share/syscons/keymaps/swedish.cp850.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '}' nop nop O
012 '+' '?' fs fs '\' '\' fs fs O
@@ -476,8 +476,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' '|' nop nop O
---- a/share/syscons/keymaps/uk.dvorak.kbd
-+++ b/share/syscons/keymaps/uk.dvorak.kbd
+--- a/src/share/syscons/keymaps/uk.dvorak.kbd
++++ b/src/share/syscons/keymaps/uk.dvorak.kbd
@@ -22,7 +22,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '[' '{' esc esc '[' '{' esc esc O
@@ -496,8 +496,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/gr.us101.acc.kbd
-+++ b/share/syscons/keymaps/gr.us101.acc.kbd
+--- a/src/share/syscons/keymaps/gr.us101.acc.kbd
++++ b/src/share/syscons/keymaps/gr.us101.acc.kbd
@@ -20,7 +20,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' ns ns '-' '_' ns ns O
@@ -516,8 +516,8 @@
084 ns ns ns ns ns ns ns ns O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' nop nop '\' '|' nop nop O
---- a/share/syscons/keymaps/german.cp850.kbd
-+++ b/share/syscons/keymaps/german.cp850.kbd
+--- a/src/share/syscons/keymaps/german.cp850.kbd
++++ b/src/share/syscons/keymaps/german.cp850.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '}' nop nop O
012 225 '?' fs fs '\' '\' fs fs O
@@ -536,8 +536,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' '|' nop nop O
---- a/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
-+++ b/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
+--- a/src/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
++++ b/src/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -556,8 +556,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/estonian.iso.kbd
-+++ b/share/syscons/keymaps/estonian.iso.kbd
+--- a/src/share/syscons/keymaps/estonian.iso.kbd
++++ b/src/share/syscons/keymaps/estonian.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' nop nop nop O
012 '+' '?' nop nop '\' nop fs nop O
@@ -576,8 +576,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/us.unix.kbd
-+++ b/share/syscons/keymaps/us.unix.kbd
+--- a/src/share/syscons/keymaps/us.unix.kbd
++++ b/src/share/syscons/keymaps/us.unix.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -605,8 +605,8 @@
104 slock saver slock saver susp nop susp nop O
105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O
106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
---- a/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
-+++ b/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
+--- a/src/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
++++ b/src/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -625,8 +625,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/hy.armscii-8.kbd
-+++ b/share/syscons/keymaps/hy.armscii-8.kbd
+--- a/src/share/syscons/keymaps/hy.armscii-8.kbd
++++ b/src/share/syscons/keymaps/hy.armscii-8.kbd
@@ -22,7 +22,7 @@
011 '0' ')' nop nop 0xD7 0xD6 nop nop O
012 '-' '_' us us 0xA8 0xAC us us O
@@ -645,8 +645,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/us.dvorak.kbd
-+++ b/share/syscons/keymaps/us.dvorak.kbd
+--- a/src/share/syscons/keymaps/us.dvorak.kbd
++++ b/src/share/syscons/keymaps/us.dvorak.kbd
@@ -26,7 +26,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '[' '{' esc esc '[' '{' esc esc O
@@ -665,8 +665,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/uk.cp850.kbd
-+++ b/share/syscons/keymaps/uk.cp850.kbd
+--- a/src/share/syscons/keymaps/uk.cp850.kbd
++++ b/src/share/syscons/keymaps/uk.cp850.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -685,8 +685,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/norwegian.dvorak.kbd
-+++ b/share/syscons/keymaps/norwegian.dvorak.kbd
+--- a/src/share/syscons/keymaps/norwegian.dvorak.kbd
++++ b/src/share/syscons/keymaps/norwegian.dvorak.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '=' nop nop O
012 '+' '?' esc esc '[' '?' nop nop O
@@ -705,8 +705,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 248 216 nop nop '|' '\' nop nop C
---- a/share/syscons/keymaps/uk.cp850-ctrl.kbd
-+++ b/share/syscons/keymaps/uk.cp850-ctrl.kbd
+--- a/src/share/syscons/keymaps/uk.cp850-ctrl.kbd
++++ b/src/share/syscons/keymaps/uk.cp850-ctrl.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -725,8 +725,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/estonian.iso15.kbd
-+++ b/share/syscons/keymaps/estonian.iso15.kbd
+--- a/src/share/syscons/keymaps/estonian.iso15.kbd
++++ b/src/share/syscons/keymaps/estonian.iso15.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' nop nop nop O
012 '+' '?' nop nop '\' nop fs nop O
@@ -745,8 +745,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/jp.pc98.iso.kbd
-+++ b/share/syscons/keymaps/jp.pc98.iso.kbd
+--- a/src/share/syscons/keymaps/jp.pc98.iso.kbd
++++ b/src/share/syscons/keymaps/jp.pc98.iso.kbd
@@ -17,7 +17,7 @@
011 '-' '_' us us '-' '=' '-' '-' O
012 '=' '+' '+' '+' '^' '`' rs rs O
@@ -756,8 +756,8 @@
015 ht btab ht btab ht btab ht btab O
016 'q' 'Q' dc1 dc1 'q' 'Q' dc1 dc1 C
017 'w' 'W' etb etb 'w' 'W' etb etb C
---- a/share/syscons/keymaps/swissfrench.iso.kbd
-+++ b/share/syscons/keymaps/swissfrench.iso.kbd
+--- a/src/share/syscons/keymaps/swissfrench.iso.kbd
++++ b/src/share/syscons/keymaps/swissfrench.iso.kbd
@@ -20,7 +20,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' fs fs 180 180 fs fs O
@@ -776,8 +776,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '\' '\' nop nop O
---- a/share/syscons/keymaps/cz.iso2.kbd
-+++ b/share/syscons/keymaps/cz.iso2.kbd
+--- a/src/share/syscons/keymaps/cz.iso2.kbd
++++ b/src/share/syscons/keymaps/cz.iso2.kbd
@@ -147,7 +147,7 @@
011 '0' ')' nop nop ddot ddot nop nop O
012 '-' '_' us us dacu dacu us us O
@@ -796,8 +796,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/german.iso.acc.kbd
-+++ b/share/syscons/keymaps/german.iso.acc.kbd
+--- a/src/share/syscons/keymaps/german.iso.acc.kbd
++++ b/src/share/syscons/keymaps/german.iso.acc.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '}' nop nop O
012 223 '?' fs fs '\' '\' fs fs O
@@ -816,8 +816,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' 166 nop nop O
---- a/share/syscons/keymaps/us.dvorakl.kbd
-+++ b/share/syscons/keymaps/us.dvorakl.kbd
+--- a/src/share/syscons/keymaps/us.dvorakl.kbd
++++ b/src/share/syscons/keymaps/us.dvorakl.kbd
@@ -19,7 +19,7 @@
011 '3' '#' nop nop '3' '#' nop nop O
012 '2' '@' nul nul '2' '@' nul nul O
@@ -836,8 +836,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/cs.latin2.qwertz.kbd
-+++ b/share/syscons/keymaps/cs.latin2.qwertz.kbd
+--- a/src/share/syscons/keymaps/cs.latin2.qwertz.kbd
++++ b/src/share/syscons/keymaps/cs.latin2.qwertz.kbd
@@ -45,7 +45,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -856,8 +856,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/ru.koi8-r.win.kbd
-+++ b/share/syscons/keymaps/ru.koi8-r.win.kbd
+--- a/src/share/syscons/keymaps/ru.koi8-r.win.kbd
++++ b/src/share/syscons/keymaps/ru.koi8-r.win.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop 176 169 nop nop O
012 '-' '_' us us 173 223 159 159 O
@@ -876,8 +876,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/swissgerman.iso.kbd
-+++ b/share/syscons/keymaps/swissgerman.iso.kbd
+--- a/src/share/syscons/keymaps/swissgerman.iso.kbd
++++ b/src/share/syscons/keymaps/swissgerman.iso.kbd
@@ -20,7 +20,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' fs fs 180 180 fs fs O
@@ -896,8 +896,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '\' '\' nop nop O
---- a/share/syscons/keymaps/ru.cp866.kbd
-+++ b/share/syscons/keymaps/ru.cp866.kbd
+--- a/src/share/syscons/keymaps/ru.cp866.kbd
++++ b/src/share/syscons/keymaps/ru.cp866.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop 176 169 nop nop O
012 '-' '_' us us 173 223 159 159 O
@@ -925,8 +925,8 @@
104 slock saver slock saver susp nop susp nop O
105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O
106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
---- a/share/syscons/keymaps/fr.dvorak.kbd
-+++ b/share/syscons/keymaps/fr.dvorak.kbd
+--- a/src/share/syscons/keymaps/fr.dvorak.kbd
++++ b/src/share/syscons/keymaps/fr.dvorak.kbd
@@ -25,7 +25,7 @@
011 '"' '0' nop '@' '"' '0' nop nop C
012 '[' '|' nop ']' '[' '|' nop nop O
@@ -945,8 +945,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '+' '*' nop ' ' '+' '*' nop nop O
---- a/share/syscons/keymaps/lt.iso4.kbd
-+++ b/share/syscons/keymaps/lt.iso4.kbd
+--- a/src/share/syscons/keymaps/lt.iso4.kbd
++++ b/src/share/syscons/keymaps/lt.iso4.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' ns ns '-' '_' ns ns O
@@ -965,8 +965,8 @@
084 ns ns ns ns ns ns ns ns O
085 nop nop nop nop nop nop nop nop O
086 ralt ralt ralt ralt ralt ralt ralt ralt O
---- a/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
-+++ b/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
+--- a/src/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
++++ b/src/share/syscons/keymaps/pl_PL.ISO8859-2.kbd
@@ -19,7 +19,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -985,8 +985,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/us.dvorakr.kbd
-+++ b/share/syscons/keymaps/us.dvorakr.kbd
+--- a/src/share/syscons/keymaps/us.dvorakr.kbd
++++ b/src/share/syscons/keymaps/us.dvorakr.kbd
@@ -19,7 +19,7 @@
011 '/' '?' nop nop '/' '?' nop nop O
012 '[' '{' esc esc '[' '{' esc esc O
@@ -1005,8 +1005,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/swedish.iso.kbd
-+++ b/share/syscons/keymaps/swedish.iso.kbd
+--- a/src/share/syscons/keymaps/swedish.iso.kbd
++++ b/src/share/syscons/keymaps/swedish.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' nop nop nop O
012 '+' '?' nop nop '\' nop fs nop O
@@ -1025,8 +1025,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/br275.cp850.kbd
-+++ b/share/syscons/keymaps/br275.cp850.kbd
+--- a/src/share/syscons/keymaps/br275.cp850.kbd
++++ b/src/share/syscons/keymaps/br275.cp850.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -1045,8 +1045,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/colemak.iso15.acc.kbd
-+++ b/share/syscons/keymaps/colemak.iso15.acc.kbd
+--- a/src/share/syscons/keymaps/colemak.iso15.acc.kbd
++++ b/src/share/syscons/keymaps/colemak.iso15.acc.kbd
@@ -65,7 +65,7 @@
000 nop nop nop nop nop nop nop nop O
@@ -1065,8 +1065,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
087 fkey11 fkey23 fkey35 fkey47 scr11 scr11 scr11 scr11 O
---- a/share/syscons/keymaps/us.dvorakx.kbd
-+++ b/share/syscons/keymaps/us.dvorakx.kbd
+--- a/src/share/syscons/keymaps/us.dvorakx.kbd
++++ b/src/share/syscons/keymaps/us.dvorakx.kbd
@@ -24,7 +24,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '[' '{' esc esc '[' '{' esc esc O
@@ -1085,8 +1085,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/si.iso.kbd
-+++ b/share/syscons/keymaps/si.iso.kbd
+--- a/src/share/syscons/keymaps/si.iso.kbd
++++ b/src/share/syscons/keymaps/si.iso.kbd
@@ -19,7 +19,7 @@
011 '0' '=' nop nop 189 189 nop nop O
012 ''' '?' us us 168 168 us us O
@@ -1105,8 +1105,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '<' '>' nop nop O
---- a/share/syscons/keymaps/be.iso.acc.kbd
-+++ b/share/syscons/keymaps/be.iso.acc.kbd
+--- a/src/share/syscons/keymaps/be.iso.acc.kbd
++++ b/src/share/syscons/keymaps/be.iso.acc.kbd
@@ -17,7 +17,7 @@
011 224 '0' nop nop '}' '}' nop nop O
012 ')' 176 nop nop ')' 176 nop nop O
@@ -1125,8 +1125,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs '\' '\' '\' fs O
---- a/share/syscons/keymaps/us.iso.acc.kbd
-+++ b/share/syscons/keymaps/us.iso.acc.kbd
+--- a/src/share/syscons/keymaps/us.iso.acc.kbd
++++ b/src/share/syscons/keymaps/us.iso.acc.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -1145,8 +1145,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
-+++ b/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
+--- a/src/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
++++ b/src/share/syscons/keymaps/ua.koi8-u.shift.alt.kbd
@@ -29,7 +29,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' ns ns 166 182 159 159 O
@@ -1174,8 +1174,8 @@
104 slock saver slock saver susp nop susp nop O
105 meta fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O
106 meta fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
---- a/share/syscons/keymaps/br275.iso.acc.kbd
-+++ b/share/syscons/keymaps/br275.iso.acc.kbd
+--- a/src/share/syscons/keymaps/br275.iso.acc.kbd
++++ b/src/share/syscons/keymaps/br275.iso.acc.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -1194,8 +1194,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/norwegian.iso.kbd
-+++ b/share/syscons/keymaps/norwegian.iso.kbd
+--- a/src/share/syscons/keymaps/norwegian.iso.kbd
++++ b/src/share/syscons/keymaps/norwegian.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '=' nop nop O
012 '+' '?' nop nop '+' '?' nop nop O
@@ -1214,8 +1214,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs 171 187 fs fs O
---- a/share/syscons/keymaps/spanish.iso.acc.kbd
-+++ b/share/syscons/keymaps/spanish.iso.acc.kbd
+--- a/src/share/syscons/keymaps/spanish.iso.acc.kbd
++++ b/src/share/syscons/keymaps/spanish.iso.acc.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' nop nop ''' '?' nop nop O
@@ -1234,8 +1234,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '<' '>' nop nop O
---- a/share/syscons/keymaps/hu.iso2.101keys.kbd
-+++ b/share/syscons/keymaps/hu.iso2.101keys.kbd
+--- a/src/share/syscons/keymaps/hu.iso2.101keys.kbd
++++ b/src/share/syscons/keymaps/hu.iso2.101keys.kbd
@@ -48,7 +48,7 @@
011 '0' ')' nop nop 246 214 nop nop O
012 '-' '_' ns ns 252 220 ns ns C
@@ -1254,8 +1254,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 237 205 nop nop nop nop nop nop C
---- a/share/syscons/keymaps/hu.iso2.102keys.kbd
-+++ b/share/syscons/keymaps/hu.iso2.102keys.kbd
+--- a/src/share/syscons/keymaps/hu.iso2.102keys.kbd
++++ b/src/share/syscons/keymaps/hu.iso2.102keys.kbd
@@ -21,7 +21,7 @@
011 246 214 nop nop 189 nop nop nop C
012 252 220 nop nop 168 nop nop nop C
@@ -1274,8 +1274,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 237 205 nop nop '<' nop nop nop C
---- a/share/syscons/keymaps/fr.iso.acc.kbd
-+++ b/share/syscons/keymaps/fr.iso.acc.kbd
+--- a/src/share/syscons/keymaps/fr.iso.acc.kbd
++++ b/src/share/syscons/keymaps/fr.iso.acc.kbd
@@ -17,7 +17,7 @@
011 224 '0' nop nop '@' nop nop nop C
012 ')' 176 nop nop ']' nop nop nop C
@@ -1294,8 +1294,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs 171 187 fs fs O
---- a/share/syscons/keymaps/fr_CA.iso.acc.kbd
-+++ b/share/syscons/keymaps/fr_CA.iso.acc.kbd
+--- a/src/share/syscons/keymaps/fr_CA.iso.acc.kbd
++++ b/src/share/syscons/keymaps/fr_CA.iso.acc.kbd
@@ -23,7 +23,7 @@
011 '0' ')' nop nop 188 ')' nop nop O
012 '-' '_' nop nop 189 '_' nop nop O
@@ -1314,8 +1314,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 171 187 nop nop 176 187 nop nop O
---- a/share/syscons/keymaps/by.iso5.kbd
-+++ b/share/syscons/keymaps/by.iso5.kbd
+--- a/src/share/syscons/keymaps/by.iso5.kbd
++++ b/src/share/syscons/keymaps/by.iso5.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -1334,8 +1334,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/sk.iso2.kbd
-+++ b/share/syscons/keymaps/sk.iso2.kbd
+--- a/src/share/syscons/keymaps/sk.iso2.kbd
++++ b/src/share/syscons/keymaps/sk.iso2.kbd
@@ -145,7 +145,7 @@
011 '0' ')' nop nop ddot ddot nop nop O
012 '-' '_' us us dacu dacu us us O
@@ -1354,8 +1354,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/pl_PL.dvorak.kbd
-+++ b/share/syscons/keymaps/pl_PL.dvorak.kbd
+--- a/src/share/syscons/keymaps/pl_PL.dvorak.kbd
++++ b/src/share/syscons/keymaps/pl_PL.dvorak.kbd
@@ -20,7 +20,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '[' '{' esc esc '[' '{' esc esc O
@@ -1374,8 +1374,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/jp.pc98.kbd
-+++ b/share/syscons/keymaps/jp.pc98.kbd
+--- a/src/share/syscons/keymaps/jp.pc98.kbd
++++ b/src/share/syscons/keymaps/jp.pc98.kbd
@@ -17,7 +17,7 @@
011 '-' '=' '-' '-' '-' '_' us us O
012 '^' '`' rs rs '=' '+' '+' '+' O
@@ -1385,8 +1385,8 @@
015 ht btab ht btab ht btab ht btab O
016 'q' 'Q' dc1 dc1 'q' 'Q' dc1 dc1 C
017 'w' 'W' etb etb 'w' 'W' etb etb C
---- a/share/syscons/keymaps/finnish.cp850.kbd
-+++ b/share/syscons/keymaps/finnish.cp850.kbd
+--- a/src/share/syscons/keymaps/finnish.cp850.kbd
++++ b/src/share/syscons/keymaps/finnish.cp850.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '}' nop nop O
012 '+' '?' fs fs '\' '\' fs fs O
@@ -1405,8 +1405,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' '|' nop nop O
---- a/share/syscons/keymaps/gr.elot.acc.kbd
-+++ b/share/syscons/keymaps/gr.elot.acc.kbd
+--- a/src/share/syscons/keymaps/gr.elot.acc.kbd
++++ b/src/share/syscons/keymaps/gr.elot.acc.kbd
@@ -20,7 +20,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' ns ns '-' '_' ns ns O
@@ -1425,8 +1425,8 @@
084 ns ns ns ns ns ns ns ns O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' nop nop '\' '|' nop nop O
---- a/share/syscons/keymaps/danish.iso.kbd
-+++ b/share/syscons/keymaps/danish.iso.kbd
+--- a/src/share/syscons/keymaps/danish.iso.kbd
++++ b/src/share/syscons/keymaps/danish.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '=' nop nop O
012 '+' '?' nop nop '+' '?' nop nop O
@@ -1445,8 +1445,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs '\' '>' fs fs O
---- a/share/syscons/keymaps/iw.iso8.kbd
-+++ b/share/syscons/keymaps/iw.iso8.kbd
+--- a/src/share/syscons/keymaps/iw.iso8.kbd
++++ b/src/share/syscons/keymaps/iw.iso8.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' ')' nop nop O
012 '-' '_' us us '-' '_' us us O
@@ -1465,8 +1465,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/el.iso07.kbd
-+++ b/share/syscons/keymaps/el.iso07.kbd
+--- a/src/share/syscons/keymaps/el.iso07.kbd
++++ b/src/share/syscons/keymaps/el.iso07.kbd
@@ -63,7 +63,7 @@
011 '0' ')' 187 187 '0' ')' 187 187 O
012 '-' '_' us us '-' '_' us us O
@@ -1485,8 +1485,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/hr.iso.kbd
-+++ b/share/syscons/keymaps/hr.iso.kbd
+--- a/src/share/syscons/keymaps/hr.iso.kbd
++++ b/src/share/syscons/keymaps/hr.iso.kbd
@@ -19,7 +19,7 @@
011 '0' '=' nop nop 189 189 nop nop O
012 ''' '?' us us 168 168 us us O
@@ -1505,8 +1505,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '<' '>' nop nop O
---- a/share/syscons/keymaps/ru.iso5.kbd
-+++ b/share/syscons/keymaps/ru.iso5.kbd
+--- a/src/share/syscons/keymaps/ru.iso5.kbd
++++ b/src/share/syscons/keymaps/ru.iso5.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '0' '%' nop nop O
012 '-' '_' ns ns '-' '_' ns ns O
@@ -1534,8 +1534,8 @@
104 slock saver slock saver susp nop susp nop O
105 meta fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O
106 meta fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O
---- a/share/syscons/keymaps/icelandic.iso.kbd
-+++ b/share/syscons/keymaps/icelandic.iso.kbd
+--- a/src/share/syscons/keymaps/icelandic.iso.kbd
++++ b/src/share/syscons/keymaps/icelandic.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' nop nop nop O
012 246 214 nop nop '\' nop fs nop O
@@ -1554,8 +1554,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/jp.106x.kbd
-+++ b/share/syscons/keymaps/jp.106x.kbd
+--- a/src/share/syscons/keymaps/jp.106x.kbd
++++ b/src/share/syscons/keymaps/jp.106x.kbd
@@ -19,7 +19,7 @@
011 '0' '~' nop nop '0' '~' nop nop O
012 '-' '=' nop nop '-' '=' nop nop O
@@ -1574,8 +1574,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/tr.iso9.q.kbd
-+++ b/share/syscons/keymaps/tr.iso9.q.kbd
+--- a/src/share/syscons/keymaps/tr.iso9.q.kbd
++++ b/src/share/syscons/keymaps/tr.iso9.q.kbd
@@ -32,7 +32,7 @@
011 '0' '=' nop nop '}' nop nop nop O
012 '*' '?' nop nop '\' nop fs nop O
@@ -1594,8 +1594,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/danish.cp865.kbd
-+++ b/share/syscons/keymaps/danish.cp865.kbd
+--- a/src/share/syscons/keymaps/danish.cp865.kbd
++++ b/src/share/syscons/keymaps/danish.cp865.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '=' nop nop O
012 '+' '?' nop nop '+' '?' nop nop O
@@ -1614,8 +1614,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs '\' '>' fs fs O
---- a/share/syscons/keymaps/ru.koi8-r.shift.kbd
-+++ b/share/syscons/keymaps/ru.koi8-r.shift.kbd
+--- a/src/share/syscons/keymaps/ru.koi8-r.shift.kbd
++++ b/src/share/syscons/keymaps/ru.koi8-r.shift.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop 176 169 nop nop O
012 '-' '_' us us 173 223 159 159 O
@@ -1634,8 +1634,8 @@
084 alock alock alock alock alock alock alock alock O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/uk.iso-ctrl.kbd
-+++ b/share/syscons/keymaps/uk.iso-ctrl.kbd
+--- a/src/share/syscons/keymaps/uk.iso-ctrl.kbd
++++ b/src/share/syscons/keymaps/uk.iso-ctrl.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '{' '{' nop nop O
012 '-' '_' us us '|' '|' us us O
@@ -1654,8 +1654,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/pt.iso.kbd
-+++ b/share/syscons/keymaps/pt.iso.kbd
+--- a/src/share/syscons/keymaps/pt.iso.kbd
++++ b/src/share/syscons/keymaps/pt.iso.kbd
@@ -19,7 +19,7 @@
011 '0' '=' nop nop '}' ')' nop nop O
012 ''' '?' ns ns '-' '_' ns ns O
@@ -1674,8 +1674,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop nop nop nop nop O
---- a/share/syscons/keymaps/swissfrench.iso.acc.kbd
-+++ b/share/syscons/keymaps/swissfrench.iso.acc.kbd
+--- a/src/share/syscons/keymaps/swissfrench.iso.acc.kbd
++++ b/src/share/syscons/keymaps/swissfrench.iso.acc.kbd
@@ -20,7 +20,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' fs fs dacu dacu fs fs O
@@ -1694,8 +1694,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '\' '\' nop nop O
---- a/share/syscons/keymaps/swissgerman.iso.acc.kbd
-+++ b/share/syscons/keymaps/swissgerman.iso.acc.kbd
+--- a/src/share/syscons/keymaps/swissgerman.iso.acc.kbd
++++ b/src/share/syscons/keymaps/swissgerman.iso.acc.kbd
@@ -20,7 +20,7 @@
011 '0' '=' nop nop '0' '=' nop nop O
012 ''' '?' fs fs dacu dacu fs fs O
@@ -1714,8 +1714,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '\' '\' nop nop O
---- a/share/syscons/keymaps/fr.dvorak.acc.kbd
-+++ b/share/syscons/keymaps/fr.dvorak.acc.kbd
+--- a/src/share/syscons/keymaps/fr.dvorak.acc.kbd
++++ b/src/share/syscons/keymaps/fr.dvorak.acc.kbd
@@ -30,7 +30,7 @@
011 '"' '0' nop nop nop nop nop nop C
012 '[' '+' nop nop nop nop nop nop C
@@ -1734,8 +1734,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 'à' 'ç' nop nop nop nop nop nop O
---- a/share/syscons/keymaps/finnish.iso.kbd
-+++ b/share/syscons/keymaps/finnish.iso.kbd
+--- a/src/share/syscons/keymaps/finnish.iso.kbd
++++ b/src/share/syscons/keymaps/finnish.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' nop nop nop O
012 '+' '?' nop nop '\' nop fs nop O
@@ -1754,8 +1754,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' nop nop nop O
---- a/share/syscons/keymaps/german.iso.kbd
-+++ b/share/syscons/keymaps/german.iso.kbd
+--- a/src/share/syscons/keymaps/german.iso.kbd
++++ b/src/share/syscons/keymaps/german.iso.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '}' '}' nop nop O
012 223 '?' fs fs '\' '\' fs fs O
@@ -1774,8 +1774,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop '|' 166 nop nop O
---- a/share/syscons/keymaps/ce.iso2.kbd
-+++ b/share/syscons/keymaps/ce.iso2.kbd
+--- a/src/share/syscons/keymaps/ce.iso2.kbd
++++ b/src/share/syscons/keymaps/ce.iso2.kbd
@@ -79,7 +79,7 @@
011 '0' ')' nop nop ddot ddot nop nop O
012 '-' '_' us us dacu dacu us us O
@@ -1794,8 +1794,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/it.iso.kbd
-+++ b/share/syscons/keymaps/it.iso.kbd
+--- a/src/share/syscons/keymaps/it.iso.kbd
++++ b/src/share/syscons/keymaps/it.iso.kbd
@@ -51,7 +51,7 @@
011 '0' '=' nop nop '}' 176 nop nop O
012 ''' '?' 96 dacu 96 191 us dgra O
@@ -1814,8 +1814,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' nop nop 124 166 nop nop O
---- a/share/syscons/keymaps/fr.macbook.acc.kbd
-+++ b/share/syscons/keymaps/fr.macbook.acc.kbd
+--- a/src/share/syscons/keymaps/fr.macbook.acc.kbd
++++ b/src/share/syscons/keymaps/fr.macbook.acc.kbd
@@ -17,7 +17,7 @@
011 224 '0' nop nop '@' nop nop nop C
012 ')' 176 nop nop ']' nop nop nop C
@@ -1834,8 +1834,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs 171 187 fs fs O
---- a/share/syscons/keymaps/latinamerican.kbd
-+++ b/share/syscons/keymaps/latinamerican.kbd
+--- a/src/share/syscons/keymaps/latinamerican.kbd
++++ b/src/share/syscons/keymaps/latinamerican.kbd
@@ -17,7 +17,7 @@
011 '0' '=' nop nop '9' ')' nop nop O
012 ''' '?' nop nop '\' '\' nop nop O
@@ -1854,8 +1854,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '<' '>' fs fs '\' '>' fs fs O
---- a/share/syscons/keymaps/uk.iso.kbd
-+++ b/share/syscons/keymaps/uk.iso.kbd
+--- a/src/share/syscons/keymaps/uk.iso.kbd
++++ b/src/share/syscons/keymaps/uk.iso.kbd
@@ -17,7 +17,7 @@
011 '0' ')' nop nop '{' '{' nop nop O
012 '-' '_' us us '|' '|' us us O
@@ -1874,8 +1874,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 '\' '|' fs fs '\' '|' fs fs O
---- a/share/syscons/keymaps/jp.106.kbd
-+++ b/share/syscons/keymaps/jp.106.kbd
+--- a/src/share/syscons/keymaps/jp.106.kbd
++++ b/src/share/syscons/keymaps/jp.106.kbd
@@ -17,7 +17,7 @@
011 '0' '~' nop nop '0' '~' nop nop O
012 '-' '=' nop nop '-' '=' nop nop O
@@ -1894,8 +1894,8 @@
084 nop nop nop nop nop nop nop nop O
085 nop nop nop nop nop nop nop nop O
086 nop nop nop nop nop nop nop nop O
---- a/share/syscons/keymaps/be.iso.kbd
-+++ b/share/syscons/keymaps/be.iso.kbd
+--- a/src/share/syscons/keymaps/be.iso.kbd
++++ b/src/share/syscons/keymaps/be.iso.kbd
@@ -17,7 +17,7 @@
011 224 '0' nop nop '}' '}' nop nop O
012 ')' 176 nop nop ')' 176 nop nop O
Modified: trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/devd_link_c++_statically.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/devd/Makefile
-+++ b/sbin/devd/Makefile
+--- a/src/sbin/devd/Makefile
++++ b/src/sbin/devd/Makefile
@@ -11,6 +11,18 @@
DPADD= ${LIBL} ${LIBUTIL}
LDADD= -ll -lutil
Modified: trunk/freebsd-utils/debian/patches/ifconfig_nojail.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/ifconfig_nojail.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/ifconfig_nojail.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,8 +1,8 @@
Merged in SVN (rev 231642).
---- a/sbin/ifconfig/Makefile
-+++ b/sbin/ifconfig/Makefile
+--- a/src/sbin/ifconfig/Makefile
++++ b/src/sbin/ifconfig/Makefile
@@ -35,8 +35,8 @@
SRCS+= ifgif.c # GIF reversed header workaround
@@ -26,8 +26,8 @@
MAN= ifconfig.8
---- a/sbin/ifconfig/ifconfig.c
-+++ b/sbin/ifconfig/ifconfig.c
+--- a/src/sbin/ifconfig/ifconfig.c
++++ b/src/sbin/ifconfig/ifconfig.c
@@ -66,7 +66,9 @@
#include <err.h>
#include <errno.h>
Modified: trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/ifr_fib_kludge.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/ifconfig/iffib.c
-+++ b/sbin/ifconfig/iffib.c
+--- a/src/sbin/ifconfig/iffib.c
++++ b/src/sbin/ifconfig/iffib.c
@@ -43,6 +43,14 @@
#include "ifconfig.h"
Modified: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/usr.sbin/ppp/Makefile
-+++ b/usr.sbin/ppp/Makefile
+--- a/src/usr.sbin/ppp/Makefile
++++ b/src/usr.sbin/ppp/Makefile
@@ -38,10 +38,10 @@
BINMODE=4550
BINOWN= root
@@ -13,8 +13,8 @@
DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
.SUFFIXES: .8 .8.m4
---- a/usr.sbin/nfsd/Makefile
-+++ b/usr.sbin/nfsd/Makefile
+--- a/src/usr.sbin/nfsd/Makefile
++++ b/src/usr.sbin/nfsd/Makefile
@@ -3,5 +3,7 @@
PROG= nfsd
@@ -23,8 +23,8 @@
+LDADD= -ltirpc
.include <bsd.prog.mk>
---- a/usr.sbin/rpc.lockd/Makefile
-+++ b/usr.sbin/rpc.lockd/Makefile
+--- a/src/usr.sbin/rpc.lockd/Makefile
++++ b/src/usr.sbin/rpc.lockd/Makefile
@@ -5,23 +5,27 @@
MAN= rpc.lockd.8
MLINKS= rpc.lockd.8 lockd.8
@@ -40,7 +40,7 @@
+LDADD= -ltirpc -lfreebsd-glue
CLEANFILES= nlm_prot_svc.c nlm_prot.h test
-+CLEANFILES+= nlm_prot_xdr.c
++CLEANFILES+= nlm_prot_xdr.c sm_inter_xdr.c
-RPCSRC= ${DESTDIR}/usr/include/rpcsvc/nlm_prot.x
+RPCSRC= ${.CURDIR}/../../include/rpcsvc/nlm_prot.x
@@ -58,8 +58,8 @@
test: ${.CURDIR}/test.c
cc -o test ${.CURDIR}/test.c -lrpcsvc
---- a/sbin/swapon/Makefile
-+++ b/sbin/swapon/Makefile
+--- a/src/sbin/swapon/Makefile
++++ b/src/sbin/swapon/Makefile
@@ -9,6 +9,6 @@
MLINKS+=swapon.8 swapctl.8
@@ -68,8 +68,8 @@
+LDADD= -lutil-freebsd -lfreebsd-glue
.include <bsd.prog.mk>
---- a/sbin/pfctl/Makefile
-+++ b/sbin/pfctl/Makefile
+--- a/src/sbin/pfctl/Makefile
++++ b/src/sbin/pfctl/Makefile
@@ -22,7 +22,7 @@
YFLAGS=
@@ -79,8 +79,17 @@
DPADD+= ${LIBM} ${LIBMD}
.include <bsd.prog.mk>
---- a/usr.sbin/authpf/Makefile
-+++ b/usr.sbin/authpf/Makefile
+--- a/src/usr.sbin/authpf/Makefile
++++ b/src/usr.sbin/authpf/Makefile
+@@ -6,7 +6,7 @@
+ PROG= authpf
+ MAN= authpf.8
+ BINOWN= root
+-BINGRP= authpf
++#BINGRP= authpf
+ BINMODE= 6555
+
+ SRCS= authpf.c
@@ -16,7 +16,7 @@
# XXX ALTQ:
CFLAGS+= -DENABLE_ALTQ
@@ -90,8 +99,8 @@
DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL}
WARNS?= 3
---- a/sbin/savecore/Makefile
-+++ b/sbin/savecore/Makefile
+--- a/src/sbin/savecore/Makefile
++++ b/src/sbin/savecore/Makefile
@@ -2,7 +2,7 @@
PROG= savecore
@@ -101,8 +110,8 @@
MAN= savecore.8
.include <bsd.prog.mk>
---- a/sbin/geom/class/raid/Makefile
-+++ b/sbin/geom/class/raid/Makefile
+--- a/src/sbin/geom/class/raid/Makefile
++++ b/src/sbin/geom/class/raid/Makefile
@@ -5,6 +5,6 @@
GEOM_CLASS= raid
@@ -111,16 +120,8 @@
+#LDADD= -lmd
.include <bsd.lib.mk>
---- a/sbin/geom/Makefile.inc
-+++ b/sbin/geom/Makefile.inc
-@@ -1,5 +1,3 @@
- # $FreeBSD$
-
- GEOM_CLASS_DIR?=/lib/geom
--
--.include "../Makefile.inc"
---- a/sbin/geom/class/eli/Makefile
-+++ b/sbin/geom/class/eli/Makefile
+--- a/src/sbin/geom/class/eli/Makefile
++++ b/src/sbin/geom/class/eli/Makefile
@@ -9,7 +9,7 @@
SRCS+= sha2.c
@@ -130,8 +131,8 @@
WARNS?= 3
---- a/sbin/geom/class/Makefile
-+++ b/sbin/geom/class/Makefile
+--- a/src/sbin/geom/class/Makefile
++++ b/src/sbin/geom/class/Makefile
@@ -7,18 +7,14 @@
.if ${MK_OPENSSL} != "no"
SUBDIR+=eli
@@ -151,8 +152,8 @@
-SUBDIR+=virstor
.include <bsd.subdir.mk>
---- a/sbin/geom/class/mirror/Makefile
-+++ b/sbin/geom/class/mirror/Makefile
+--- a/src/sbin/geom/class/mirror/Makefile
++++ b/src/sbin/geom/class/mirror/Makefile
@@ -5,6 +5,6 @@
GEOM_CLASS= mirror
@@ -161,8 +162,8 @@
+#LDADD= -lmd
.include <bsd.lib.mk>
---- a/sbin/geom/class/raid3/Makefile
-+++ b/sbin/geom/class/raid3/Makefile
+--- a/src/sbin/geom/class/raid3/Makefile
++++ b/src/sbin/geom/class/raid3/Makefile
@@ -5,6 +5,6 @@
GEOM_CLASS= raid3
@@ -171,8 +172,8 @@
+#LDADD= -lmd
.include <bsd.lib.mk>
---- a/sbin/geom/core/Makefile
-+++ b/sbin/geom/core/Makefile
+--- a/src/sbin/geom/core/Makefile
++++ b/src/sbin/geom/core/Makefile
@@ -12,6 +12,6 @@
CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
@@ -181,8 +182,8 @@
+LDADD= -lgeom -ldl -lbsd
.include <bsd.prog.mk>
---- a/usr.sbin/pppctl/Makefile
-+++ b/usr.sbin/pppctl/Makefile
+--- a/src/usr.sbin/pppctl/Makefile
++++ b/src/usr.sbin/pppctl/Makefile
@@ -6,6 +6,6 @@
WARNS?= 2
@@ -191,8 +192,8 @@
+LDADD= -lpthread -ledit -lbsd
.include <bsd.prog.mk>
---- a/sbin/mount_nfs/Makefile
-+++ b/sbin/mount_nfs/Makefile
+--- a/src/sbin/mount_nfs/Makefile
++++ b/src/sbin/mount_nfs/Makefile
@@ -4,6 +4,7 @@
PROG= mount_nfs
@@ -201,8 +202,8 @@
MAN= mount_nfs.8
MLINKS= mount_nfs.8 mount_oldnfs.8
---- a/usr.sbin/mountd/Makefile
-+++ b/usr.sbin/mountd/Makefile
+--- a/src/usr.sbin/mountd/Makefile
++++ b/src/usr.sbin/mountd/Makefile
@@ -6,12 +6,12 @@
MAN= exports.5 netgroup.5 mountd.8
@@ -218,8 +219,8 @@
+LDADD= -ltirpc -lbsd
.include <bsd.prog.mk>
---- a/usr.sbin/arp/Makefile
-+++ b/usr.sbin/arp/Makefile
+--- a/src/usr.sbin/arp/Makefile
++++ b/src/usr.sbin/arp/Makefile
@@ -3,6 +3,7 @@
PROG= arp
@@ -228,8 +229,8 @@
WARNS?= 3
---- a/usr.bin/netstat/Makefile
-+++ b/usr.bin/netstat/Makefile
+--- a/src/usr.bin/netstat/Makefile
++++ b/src/usr.bin/netstat/Makefile
@@ -29,7 +29,8 @@
BINGRP= kmem
BINMODE=2555
@@ -240,8 +241,8 @@
.if ${MK_NETGRAPH_SUPPORT} != "no"
SRCS+= netgraph.c
---- a/sbin/atacontrol/Makefile
-+++ b/sbin/atacontrol/Makefile
+--- a/src/sbin/atacontrol/Makefile
++++ b/src/sbin/atacontrol/Makefile
@@ -3,4 +3,6 @@
PROG= atacontrol
MAN= atacontrol.8
@@ -249,8 +250,8 @@
+LDADD+= -lfreebsd-glue
+
.include <bsd.prog.mk>
---- a/sbin/umount/Makefile
-+++ b/sbin/umount/Makefile
+--- a/src/sbin/umount/Makefile
++++ b/src/sbin/umount/Makefile
@@ -6,6 +6,8 @@
SRCS= umount.c vfslist.c mounttab.c
MAN= umount.8
@@ -260,8 +261,8 @@
MOUNT= ${.CURDIR}/../mount
UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
CFLAGS+= -I${MOUNT} -I${UMNTALL}
---- a/sbin/route/Makefile
-+++ b/sbin/route/Makefile
+--- a/src/sbin/route/Makefile
++++ b/src/sbin/route/Makefile
@@ -9,6 +9,8 @@
WARNS?= 3
CLEANFILES+=keywords.h _keywords.tmp
@@ -271,8 +272,8 @@
CFLAGS+= -DNS
.if ${MK_INET6_SUPPORT} != "no"
---- a/sbin/mount/Makefile
-+++ b/sbin/mount/Makefile
+--- a/src/sbin/mount/Makefile
++++ b/src/sbin/mount/Makefile
@@ -7,6 +7,8 @@
# We do NOT install the getmntopts.3 man page.
@@ -283,8 +284,8 @@
+LDADD+= -lfreebsd-glue
.include <bsd.prog.mk>
---- a/usr.sbin/jail/Makefile
-+++ b/usr.sbin/jail/Makefile
+--- a/src/usr.sbin/jail/Makefile
++++ b/src/usr.sbin/jail/Makefile
@@ -7,7 +7,9 @@
SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
@@ -296,8 +297,8 @@
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR}
---- a/sbin/camcontrol/Makefile
-+++ b/sbin/camcontrol/Makefile
+--- a/src/sbin/camcontrol/Makefile
++++ b/src/sbin/camcontrol/Makefile
@@ -12,7 +12,7 @@
WARNS?= 3
.endif
@@ -307,8 +308,8 @@
MAN= camcontrol.8
.include <bsd.prog.mk>
---- a/sbin/mdconfig/Makefile
-+++ b/sbin/mdconfig/Makefile
+--- a/src/sbin/mdconfig/Makefile
++++ b/src/sbin/mdconfig/Makefile
@@ -4,6 +4,6 @@
MAN= mdconfig.8
@@ -317,8 +318,8 @@
+LDADD= -lgeom
.include <bsd.prog.mk>
---- a/sbin/devd/Makefile
-+++ b/sbin/devd/Makefile
+--- a/src/sbin/devd/Makefile
++++ b/src/sbin/devd/Makefile
@@ -9,7 +9,7 @@
NO_SHARED?=YES
@@ -328,8 +329,8 @@
LIBSTDC++ != \
g++ -print-file-name=crt1.o ; \
---- a/usr.sbin/powerd/Makefile
-+++ b/usr.sbin/powerd/Makefile
+--- a/src/usr.sbin/powerd/Makefile
++++ b/src/usr.sbin/powerd/Makefile
@@ -4,6 +4,6 @@
MAN= powerd.8
@@ -338,3 +339,110 @@
+#LDADD= -lutil
.include <bsd.prog.mk>
+--- /dev/null
++++ b/src/bin/Makefile
+@@ -0,0 +1,5 @@
++SUBDIR = \
++ kenv \
++ ${NULL}
++
++.include <bsd.subdir.mk>
+--- /dev/null
++++ b/src/sbin/Makefile
+@@ -0,0 +1,42 @@
++SUBDIR = \
++ devd \
++ ifconfig \
++ route \
++ mdconfig \
++ sysctl \
++ kldload \
++ kldstat \
++ kldunload \
++ ${NULL}
++
++.if !defined(RESCUE)
++SUBDIR += \
++ atacontrol \
++ camcontrol \
++ ccdconfig \
++ devfs \
++ dmesg \
++ dumpon \
++ geom \
++ kldconfig \
++ mount \
++ mount_cd9660 \
++ mount_ext2fs \
++ mount_hpfs \
++ mount_msdosfs \
++ mount_nfs \
++ mount_ntfs \
++ mount_nullfs \
++ mount_reiserfs \
++ mount_std \
++ mount_udf \
++ mount_unionfs \
++ nfsiod \
++ pfctl \
++ savecore \
++ swapon \
++ umount \
++ ${NULL}
++.endif
++
++.include <bsd.subdir.mk>
+--- /dev/null
++++ b/src/usr.bin/Makefile
+@@ -0,0 +1,9 @@
++SUBDIR = \
++ kdump \
++ ktrace \
++ ktrdump \
++ mkuzip \
++ netstat \
++ vmstat \
++
++.include <bsd.subdir.mk>
+--- /dev/null
++++ b/src/usr.sbin/Makefile
+@@ -0,0 +1,22 @@
++SUBDIR = \
++ kbdcontrol \
++
++.if !defined(RESCUE)
++SUBDIR += \
++ acpi \
++ arp \
++ authpf \
++ jail \
++ mountd \
++ nfsd \
++ powerd \
++ ppp \
++ pppctl \
++ rpc.statd \
++ rpc.lockd \
++ rpc.umntall \
++ vidcontrol \
++ ${NULL}
++.endif
++
++.include <bsd.subdir.mk>
+--- /dev/null
++++ b/src/Makefile
+@@ -0,0 +1,14 @@
++SUBDIR = \
++ bin \
++ sbin \
++ etc/devd \
++ usr.sbin \
++ share/syscons/scrnmaps \
++
++.if !defined(RESCUE)
++SUBDIR += \
++ usr.bin \
++ ${NULL}
++.endif
++
++.include <bsd.subdir.mk>
Modified: trunk/freebsd-utils/debian/patches/mount_cli_compat.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/mount_cli_compat.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/mount_cli_compat.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -5,8 +5,8 @@
Also see kfreebsd-10/debian/patches/mount_remount.diff
---- a/sbin/mount/mount.c
-+++ b/sbin/mount/mount.c
+--- a/src/sbin/mount/mount.c
++++ b/src/sbin/mount/mount.c
@@ -252,8 +252,11 @@
options = NULL;
vfslist = NULL;
Modified: trunk/freebsd-utils/debian/patches/mount_n.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/mount_n.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/mount_n.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,8 +1,8 @@
From HEAD (SVN rev 253372)
---- a/sbin/mount/mount.c
-+++ b/sbin/mount/mount.c
+--- a/src/sbin/mount/mount.c
++++ b/src/sbin/mount/mount.c
@@ -252,7 +252,7 @@
options = NULL;
vfslist = NULL;
@@ -22,8 +22,8 @@
case 'o':
if (*optarg) {
options = catopt(options, optarg);
---- a/sbin/mount/mount.8
-+++ b/sbin/mount/mount.8
+--- a/src/sbin/mount/mount.8
++++ b/src/sbin/mount/mount.8
@@ -111,6 +111,9 @@
.Fl a
option, also mount those file systems which are marked as
Modified: trunk/freebsd-utils/debian/patches/pf_regex_c.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/pf_regex_c.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/pf_regex_c.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -13,8 +13,8 @@
exit 0
---- a/contrib/pf/authpf/authpf.c
-+++ b/contrib/pf/authpf/authpf.c
+--- a/src/contrib/pf/authpf/authpf.c
++++ b/src/contrib/pf/authpf/authpf.c
@@ -33,7 +33,7 @@
#include <err.h>
@@ -69,8 +69,8 @@
static __dead2 void
#else
static __dead void
---- a/contrib/pf/ftp-proxy/ftp-proxy.c
-+++ b/contrib/pf/ftp-proxy/ftp-proxy.c
+--- a/src/contrib/pf/ftp-proxy/ftp-proxy.c
++++ b/src/contrib/pf/ftp-proxy/ftp-proxy.c
@@ -585,7 +585,7 @@
/* We don't care about truncation. */
@@ -80,8 +80,8 @@
strvis(visbuf, buf, VIS_CSTYLE | VIS_NL);
#else
strnvis(visbuf, buf, sizeof visbuf, VIS_CSTYLE | VIS_NL);
---- a/contrib/pf/libevent/kqueue.c
-+++ b/contrib/pf/libevent/kqueue.c
+--- a/src/contrib/pf/libevent/kqueue.c
++++ b/src/contrib/pf/libevent/kqueue.c
@@ -48,7 +48,7 @@
#include <inttypes.h>
#endif
@@ -91,8 +91,8 @@
#define INTPTR(x) (intptr_t)x
#else
#define INTPTR(x) x
---- a/contrib/pf/pfctl/parse.y
-+++ b/contrib/pf/pfctl/parse.y
+--- a/src/contrib/pf/pfctl/parse.y
++++ b/src/contrib/pf/pfctl/parse.y
@@ -33,7 +33,7 @@
#include <sys/types.h>
#include <sys/socket.h>
@@ -156,8 +156,8 @@
int fibs;
size_t l = sizeof(fibs);
---- a/contrib/pf/pfctl/pfctl_altq.c
-+++ b/contrib/pf/pfctl/pfctl_altq.c
+--- a/src/contrib/pf/pfctl/pfctl_altq.c
++++ b/src/contrib/pf/pfctl/pfctl_altq.c
@@ -77,7 +77,7 @@
double);
static double sc_x2y(struct service_curve *, double);
@@ -212,8 +212,8 @@
ifr.ifr_mtu = 1500;
#else
err(1, "SIOCGIFMTU");
---- a/contrib/pf/pfctl/pfctl.c
-+++ b/contrib/pf/pfctl/pfctl.c
+--- a/src/contrib/pf/pfctl/pfctl.c
++++ b/src/contrib/pf/pfctl/pfctl.c
@@ -39,7 +39,7 @@
#include <sys/socket.h>
#include <sys/stat.h>
@@ -250,8 +250,8 @@
altqsupport = 0;
#else
altqsupport = 1;
---- a/contrib/pf/pfctl/pfctl.h
-+++ b/contrib/pf/pfctl/pfctl.h
+--- a/src/contrib/pf/pfctl/pfctl.h
++++ b/src/contrib/pf/pfctl/pfctl.h
@@ -86,7 +86,7 @@
int pfctl_show_ifaces(const char *, int);
FILE *pfctl_fopen(const char *, const char *);
@@ -261,8 +261,8 @@
extern int altqsupport;
extern int dummynetsupport;
#define HTONL(x) (x) = htonl((__uint32_t)(x))
---- a/contrib/pf/pfctl/pfctl_optimize.c
-+++ b/contrib/pf/pfctl/pfctl_optimize.c
+--- a/src/contrib/pf/pfctl/pfctl_optimize.c
++++ b/src/contrib/pf/pfctl/pfctl_optimize.c
@@ -862,7 +862,7 @@
break;
}
@@ -272,8 +272,8 @@
if (por2 == NULL)
#else
if (por2 == TAILQ_END(&block->sb_rules))
---- a/contrib/pf/pfctl/pfctl_parser.c
-+++ b/contrib/pf/pfctl/pfctl_parser.c
+--- a/src/contrib/pf/pfctl/pfctl_parser.c
++++ b/src/contrib/pf/pfctl/pfctl_parser.c
@@ -580,7 +580,7 @@
s->src_nodes, "");
for (i = 0; i < SCNT_MAX; i++) {
@@ -310,8 +310,8 @@
printf(" divert-to %u", ntohs(r->divert.port));
#else
if (PF_AZERO(&r->divert.addr, r->af)) {
---- a/contrib/pf/pfctl/pfctl_parser.h
-+++ b/contrib/pf/pfctl/pfctl_parser.h
+--- a/src/contrib/pf/pfctl/pfctl_parser.h
++++ b/src/contrib/pf/pfctl/pfctl_parser.h
@@ -159,7 +159,7 @@
} data;
};
@@ -321,8 +321,8 @@
/*
* XXX
* Absolutely this is not correct location to define this.
---- a/contrib/pf/pfctl/pfctl_qstats.c
-+++ b/contrib/pf/pfctl/pfctl_qstats.c
+--- a/src/contrib/pf/pfctl/pfctl_qstats.c
++++ b/src/contrib/pf/pfctl/pfctl_qstats.c
@@ -89,7 +89,7 @@
struct pf_altq_node *root = NULL, *node;
int nodes, dotitle = (opts & PF_OPT_SHOWALL);
@@ -368,8 +368,8 @@
if (a->altq.local_flags & PFALTQ_FLAG_IF_REMOVED)
return;
#endif
---- a/contrib/pf/pfctl/pf_print_state.c
-+++ b/contrib/pf/pfctl/pf_print_state.c
+--- a/src/contrib/pf/pfctl/pf_print_state.c
++++ b/src/contrib/pf/pfctl/pf_print_state.c
@@ -35,7 +35,7 @@
#include <sys/types.h>
@@ -397,8 +397,8 @@
(unsigned long long)betoh64(id), ntohl(s->creatorid));
#else
betoh64(id), ntohl(s->creatorid));
---- a/contrib/pf/pflogd/pflogd.c
-+++ b/contrib/pf/pflogd/pflogd.c
+--- a/src/contrib/pf/pflogd/pflogd.c
++++ b/src/contrib/pf/pflogd/pflogd.c
@@ -51,7 +51,7 @@
#include <errno.h>
#include <stdarg.h>
@@ -480,8 +480,8 @@
sh.ts.tv_sec = (bpf_int32)h->ts.tv_sec;
sh.ts.tv_usec = (bpf_int32)h->ts.tv_usec;
sh.caplen = h->caplen;
---- a/contrib/pf/pflogd/pidfile.c
-+++ b/contrib/pf/pflogd/pidfile.c
+--- a/src/contrib/pf/pflogd/pidfile.c
++++ b/src/contrib/pf/pflogd/pidfile.c
@@ -48,7 +48,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -491,8 +491,8 @@
#include "pidfile.h"
#else
#include <util.h>
---- a/contrib/pf/pflogd/privsep.c
-+++ b/contrib/pf/pflogd/privsep.c
+--- a/src/contrib/pf/pflogd/privsep.c
++++ b/src/contrib/pf/pflogd/privsep.c
@@ -73,7 +73,7 @@
int snaplen, ret, olderrno;
struct passwd *pw;
@@ -502,8 +502,8 @@
for (i = 1; i < NSIG; i++)
#else
for (i = 1; i < _NSIG; i++)
---- a/contrib/pf/tftp-proxy/filter.c
-+++ b/contrib/pf/tftp-proxy/filter.c
+--- a/src/contrib/pf/tftp-proxy/filter.c
++++ b/src/contrib/pf/tftp-proxy/filter.c
@@ -298,7 +298,7 @@
pfr.rule.quick = 1;
pfr.rule.log = rule_log;
@@ -513,8 +513,8 @@
pfr.rule.flags = (proto == IPPROTO_TCP ? TH_SYN : 0);
pfr.rule.flagset = (proto == IPPROTO_TCP ?
(TH_SYN|TH_ACK|TH_FIN|TH_RST) : 0);
---- a/sys/contrib/pf/net/if_pflog.c
-+++ b/sys/contrib/pf/net/if_pflog.c
+--- a/src/sys/contrib/pf/net/if_pflog.c
++++ b/src/sys/contrib/pf/net/if_pflog.c
@@ -33,7 +33,7 @@
* PURPOSE.
*/
@@ -731,8 +731,8 @@
static int
pflog_modevent(module_t mod, int type, void *data)
{
---- a/sys/contrib/pf/net/if_pflog.h
-+++ b/sys/contrib/pf/net/if_pflog.h
+--- a/src/sys/contrib/pf/net/if_pflog.h
++++ b/src/sys/contrib/pf/net/if_pflog.h
@@ -30,7 +30,7 @@
#define PFLOGIFS_MAX 16
@@ -751,8 +751,8 @@
struct pf_rule;
struct pf_ruleset;
struct pfi_kif;
---- a/sys/contrib/pf/net/if_pflow.h
-+++ b/sys/contrib/pf/net/if_pflow.h
+--- a/src/sys/contrib/pf/net/if_pflow.h
++++ b/src/sys/contrib/pf/net/if_pflow.h
@@ -66,7 +66,7 @@
unsigned int sc_maxcount;
u_int64_t sc_gcounter;
@@ -762,8 +762,8 @@
struct callout sc_tmo;
#else
struct timeout sc_tmo;
---- a/sys/contrib/pf/net/if_pfsync.c
-+++ b/sys/contrib/pf/net/if_pfsync.c
+--- a/src/sys/contrib/pf/net/if_pfsync.c
++++ b/src/sys/contrib/pf/net/if_pfsync.c
@@ -52,7 +52,7 @@
* 1.170 - SIOCSIFMTU checks
*/
@@ -2346,8 +2346,8 @@
static int
pfsync_multicast_setup(struct pfsync_softc *sc)
{
---- a/sys/contrib/pf/net/if_pfsync.h
-+++ b/sys/contrib/pf/net/if_pfsync.h
+--- a/src/sys/contrib/pf/net/if_pfsync.h
++++ b/src/sys/contrib/pf/net/if_pfsync.h
@@ -268,7 +268,7 @@
int pfsyncr_authlevel;
};
@@ -2375,8 +2375,8 @@
void pfsync_state_export(struct pfsync_state *,
struct pf_state *);
#endif
---- a/sys/contrib/pf/net/pf.c
-+++ b/sys/contrib/pf/net/pf.c
+--- a/src/sys/contrib/pf/net/pf.c
++++ b/src/sys/contrib/pf/net/pf.c
@@ -35,7 +35,7 @@
*
*/
@@ -4964,8 +4964,8 @@
struct pf_mtag *pf_tag;
if ((pf_tag = pf_find_mtag(m)) != NULL)
---- a/sys/contrib/pf/net/pf_if.c
-+++ b/sys/contrib/pf/net/pf_if.c
+--- a/src/sys/contrib/pf/net/pf_if.c
++++ b/src/sys/contrib/pf/net/pf_if.c
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
@@ -5387,8 +5387,8 @@
void
pfi_attach_ifnet_event(void *arg __unused, struct ifnet *ifp)
{
---- a/sys/contrib/pf/net/pf_ioctl.c
-+++ b/sys/contrib/pf/net/pf_ioctl.c
+--- a/src/sys/contrib/pf/net/pf_ioctl.c
++++ b/src/sys/contrib/pf/net/pf_ioctl.c
@@ -35,7 +35,7 @@
*
*/
@@ -6829,8 +6829,8 @@
RB_FOREACH(n, pf_src_tree, &V_tree_src_tracking) {
#else
RB_FOREACH(n, pf_src_tree, &tree_src_tracking) {
---- a/sys/contrib/pf/net/pf_lb.c
-+++ b/sys/contrib/pf/net/pf_lb.c
+--- a/src/sys/contrib/pf/net/pf_lb.c
++++ b/src/sys/contrib/pf/net/pf_lb.c
@@ -35,7 +35,7 @@
*
*/
@@ -6975,8 +6975,8 @@
pool_put(&V_pf_state_key_pl, *nkp);
pool_put(&V_pf_state_key_pl, *skp);
#else
---- a/sys/contrib/pf/net/pf_norm.c
-+++ b/sys/contrib/pf/net/pf_norm.c
+--- a/src/sys/contrib/pf/net/pf_norm.c
++++ b/src/sys/contrib/pf/net/pf_norm.c
@@ -25,7 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
@@ -7663,8 +7663,8 @@
u_char opts[TCP_MAXOLEN];
#else
u_char opts[MAX_TCPOPTLEN];
---- a/sys/contrib/pf/net/pf_osfp.c
-+++ b/sys/contrib/pf/net/pf_osfp.c
+--- a/src/sys/contrib/pf/net/pf_osfp.c
++++ b/src/sys/contrib/pf/net/pf_osfp.c
@@ -17,7 +17,7 @@
*
*/
@@ -7844,8 +7844,8 @@
if (f != (f2 = pf_osfp_find(&V_pf_osfp_list, &find, 0))) {
#else
if (f != (f2 = pf_osfp_find(&pf_osfp_list, &find, 0))) {
---- a/sys/contrib/pf/net/pf_ruleset.c
-+++ b/sys/contrib/pf/net/pf_ruleset.c
+--- a/src/sys/contrib/pf/net/pf_ruleset.c
++++ b/src/sys/contrib/pf/net/pf_ruleset.c
@@ -35,7 +35,7 @@
*
*/
@@ -7936,8 +7936,8 @@
RB_REMOVE(pf_anchor_global, &V_pf_anchors, ruleset->anchor);
#else
RB_REMOVE(pf_anchor_global, &pf_anchors, ruleset->anchor);
---- a/sys/contrib/pf/net/pf_table.c
-+++ b/sys/contrib/pf/net/pf_table.c
+--- a/src/sys/contrib/pf/net/pf_table.c
++++ b/src/sys/contrib/pf/net/pf_table.c
@@ -30,7 +30,7 @@
*
*/
@@ -8359,8 +8359,8 @@
kt->pfrkt_ip6->rnh_walktree(kt->pfrkt_ip6, pfr_walktree, &w);
#else
rn_walktree(kt->pfrkt_ip6, pfr_walktree, &w);
---- a/sys/contrib/pf/net/pfvar.h
-+++ b/sys/contrib/pf/net/pfvar.h
+--- a/src/sys/contrib/pf/net/pfvar.h
++++ b/src/sys/contrib/pf/net/pfvar.h
@@ -37,7 +37,7 @@
#include <sys/types.h>
#include <sys/queue.h>
Modified: trunk/freebsd-utils/debian/patches/pf_regex_followup.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/pf_regex_followup.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/pf_regex_followup.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/contrib/pf/authpf/authpf.c
-+++ b/contrib/pf/authpf/authpf.c
+--- a/src/contrib/pf/authpf/authpf.c
++++ b/src/contrib/pf/authpf/authpf.c
@@ -19,6 +19,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -35,8 +35,8 @@
login_close(lc);
#else
if (shell != pw->pw_shell)
---- a/contrib/pf/ftp-proxy/ftp-proxy.c
-+++ b/contrib/pf/ftp-proxy/ftp-proxy.c
+--- a/src/contrib/pf/ftp-proxy/ftp-proxy.c
++++ b/src/contrib/pf/ftp-proxy/ftp-proxy.c
@@ -19,6 +19,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -45,8 +45,8 @@
#include <sys/queue.h>
#include <sys/types.h>
#include <sys/time.h>
---- a/contrib/pf/libevent/kqueue.c
-+++ b/contrib/pf/libevent/kqueue.c
+--- a/src/contrib/pf/libevent/kqueue.c
++++ b/src/contrib/pf/libevent/kqueue.c
@@ -30,6 +30,7 @@
#include "config.h"
#endif
@@ -55,8 +55,8 @@
#include <sys/types.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
---- a/contrib/pf/pfctl/parse.y
-+++ b/contrib/pf/pfctl/parse.y
+--- a/src/contrib/pf/pfctl/parse.y
++++ b/src/contrib/pf/pfctl/parse.y
@@ -30,6 +30,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -65,8 +65,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/stat.h>
---- a/contrib/pf/pfctl/pf_print_state.c
-+++ b/contrib/pf/pfctl/pf_print_state.c
+--- a/src/contrib/pf/pfctl/pf_print_state.c
++++ b/src/contrib/pf/pfctl/pf_print_state.c
@@ -33,6 +33,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -75,8 +75,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#if 1
---- a/contrib/pf/pfctl/pfctl.c
-+++ b/contrib/pf/pfctl/pfctl.c
+--- a/src/contrib/pf/pfctl/pfctl.c
++++ b/src/contrib/pf/pfctl/pfctl.c
@@ -34,6 +34,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -85,8 +85,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
---- a/contrib/pf/pfctl/pfctl_altq.c
-+++ b/contrib/pf/pfctl/pfctl_altq.c
+--- a/src/contrib/pf/pfctl/pfctl_altq.c
++++ b/src/contrib/pf/pfctl/pfctl_altq.c
@@ -21,6 +21,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -95,8 +95,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
---- a/contrib/pf/pfctl/pfctl_optimize.c
-+++ b/contrib/pf/pfctl/pfctl_optimize.c
+--- a/src/contrib/pf/pfctl/pfctl_optimize.c
++++ b/src/contrib/pf/pfctl/pfctl_optimize.c
@@ -19,6 +19,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -105,8 +105,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
---- a/contrib/pf/pfctl/pfctl_qstats.c
-+++ b/contrib/pf/pfctl/pfctl_qstats.c
+--- a/src/contrib/pf/pfctl/pfctl_qstats.c
++++ b/src/contrib/pf/pfctl/pfctl_qstats.c
@@ -19,6 +19,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -115,8 +115,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
---- a/contrib/pf/pflogd/pflogd.c
-+++ b/contrib/pf/pflogd/pflogd.c
+--- a/src/contrib/pf/pflogd/pflogd.c
++++ b/src/contrib/pf/pflogd/pflogd.c
@@ -33,6 +33,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -125,8 +125,8 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/file.h>
---- a/contrib/pf/pflogd/privsep.c
-+++ b/contrib/pf/pflogd/privsep.c
+--- a/src/contrib/pf/pflogd/privsep.c
++++ b/src/contrib/pf/pflogd/privsep.c
@@ -20,6 +20,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -135,8 +135,8 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
---- a/contrib/pf/tftp-proxy/filter.c
-+++ b/contrib/pf/tftp-proxy/filter.c
+--- a/src/contrib/pf/tftp-proxy/filter.c
++++ b/src/contrib/pf/tftp-proxy/filter.c
@@ -20,6 +20,7 @@
#include <syslog.h>
Modified: trunk/freebsd-utils/debian/patches/powerd_no_cpufreq.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/powerd_no_cpufreq.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/powerd_no_cpufreq.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,8 +1,8 @@
From SVN rev 234070.
---- a/usr.sbin/powerd/powerd.c
-+++ b/usr.sbin/powerd/powerd.c
+--- a/src/usr.sbin/powerd/powerd.c
++++ b/src/usr.sbin/powerd/powerd.c
@@ -44,6 +44,7 @@
#include <stdio.h>
#include <stdlib.h>
Modified: trunk/freebsd-utils/debian/patches/ppp_macros.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/ppp_macros.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/ppp_macros.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/usr.sbin/ppp/bundle.c
-+++ b/usr.sbin/ppp/bundle.c
+--- a/src/usr.sbin/ppp/bundle.c
++++ b/src/usr.sbin/ppp/bundle.c
@@ -699,7 +699,7 @@
static struct bundle bundle; /* there can be only one */
int enoentcount, err, minunit, maxunit;
@@ -27,8 +27,8 @@
if (bundle.unit == minunit && !kldtried++) {
/*
* Attempt to load the tunnel interface KLD if it isn't loaded
---- a/usr.sbin/ppp/cbcp.c
-+++ b/usr.sbin/ppp/cbcp.c
+--- a/src/usr.sbin/ppp/cbcp.c
++++ b/src/usr.sbin/ppp/cbcp.c
@@ -28,7 +28,7 @@
#include <sys/param.h>
@@ -38,8 +38,8 @@
#include <netinet/in.h>
#endif
#include <sys/un.h>
---- a/usr.sbin/ppp/chap_ms.c
-+++ b/usr.sbin/ppp/chap_ms.c
+--- a/src/usr.sbin/ppp/chap_ms.c
++++ b/src/usr.sbin/ppp/chap_ms.c
@@ -29,8 +29,9 @@
* $FreeBSD$
*/
@@ -60,8 +60,8 @@
#define LENGTH 20
static char *
SHA1_End(SHA_CTX *ctx, char *buf)
---- a/usr.sbin/ppp/defs.c
-+++ b/usr.sbin/ppp/defs.c
+--- a/src/usr.sbin/ppp/defs.c
++++ b/src/usr.sbin/ppp/defs.c
@@ -39,16 +39,16 @@
#include <stdio.h>
#include <stdlib.h>
@@ -113,8 +113,8 @@
int
loadmodules(int how, const char *module, ...)
{
---- a/usr.sbin/ppp/defs.h
-+++ b/usr.sbin/ppp/defs.h
+--- a/src/usr.sbin/ppp/defs.h
++++ b/src/usr.sbin/ppp/defs.h
@@ -28,8 +28,10 @@
* $FreeBSD$
*/
@@ -136,8 +136,8 @@
extern void randinit(void);
#else
#define random arc4random
---- a/usr.sbin/ppp/id.c
-+++ b/usr.sbin/ppp/id.c
+--- a/src/usr.sbin/ppp/id.c
++++ b/src/usr.sbin/ppp/id.c
@@ -40,7 +40,7 @@
#include <stdio.h>
#include <string.h>
@@ -156,8 +156,8 @@
int
ID0kldload(const char *dev)
{
---- a/usr.sbin/ppp/id.h
-+++ b/usr.sbin/ppp/id.h
+--- a/src/usr.sbin/ppp/id.h
++++ b/src/usr.sbin/ppp/id.h
@@ -26,6 +26,8 @@
* $FreeBSD$
*/
@@ -185,8 +185,8 @@
#include <sys/param.h>
#include <sys/linker.h>
#define ID0kldload kldload
---- a/usr.sbin/ppp/iface.c
-+++ b/usr.sbin/ppp/iface.c
+--- a/src/usr.sbin/ppp/iface.c
++++ b/src/usr.sbin/ppp/iface.c
@@ -31,7 +31,7 @@
#include <netinet/in.h>
#include <net/if.h>
@@ -214,8 +214,8 @@
ifrq.ifr_flagshigh = new_flags >> 16;
#endif
---- a/usr.sbin/ppp/lqr.c
-+++ b/usr.sbin/ppp/lqr.c
+--- a/src/usr.sbin/ppp/lqr.c
++++ b/src/usr.sbin/ppp/lqr.c
@@ -30,7 +30,7 @@
#include <sys/param.h>
@@ -225,8 +225,8 @@
#include <netinet/in.h>
#endif
#include <sys/un.h>
---- a/usr.sbin/ppp/tun.c
-+++ b/usr.sbin/ppp/tun.c
+--- a/src/usr.sbin/ppp/tun.c
++++ b/src/usr.sbin/ppp/tun.c
@@ -29,7 +29,7 @@
#include <sys/param.h>
Modified: trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/rpc.lockd-startup-fix.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/usr.sbin/rpc.lockd/lockd.c
-+++ b/usr.sbin/rpc.lockd/lockd.c
+--- a/src/usr.sbin/rpc.lockd/lockd.c
++++ b/src/usr.sbin/rpc.lockd/lockd.c
@@ -905,6 +905,7 @@
sin->sin_family = AF_INET;
sin->sin_port = htons(0);
Modified: trunk/freebsd-utils/debian/patches/savecore_signal.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/savecore_signal.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/savecore_signal.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/sbin/savecore/savecore.c
-+++ b/sbin/savecore/savecore.c
+--- a/src/sbin/savecore/savecore.c
++++ b/src/sbin/savecore/savecore.c
@@ -77,6 +77,7 @@
#include <stdlib.h>
#include <string.h>
Modified: trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/patches/stablerestart-fhs-compliance.diff 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,5 +1,5 @@
---- a/usr.sbin/nfsd/nfsd.c
-+++ b/usr.sbin/nfsd/nfsd.c
+--- a/src/usr.sbin/nfsd/nfsd.c
++++ b/src/usr.sbin/nfsd/nfsd.c
@@ -80,8 +80,8 @@
int debug = 0;
#endif
@@ -11,8 +11,8 @@
#define MAXNFSDCNT 256
#define DEFNFSDCNT 4
pid_t children[MAXNFSDCNT]; /* PIDs of children */
---- a/usr.sbin/nfsd/nfsv4.4
-+++ b/usr.sbin/nfsd/nfsv4.4
+--- a/src/usr.sbin/nfsd/nfsv4.4
++++ b/src/usr.sbin/nfsd/nfsv4.4
@@ -311,10 +311,10 @@
If all other nfsd threads are blocked waiting for lock(s) held by this nfsd
thread, then there isn't an nfsd thread to service the Close RPC.
@@ -27,8 +27,8 @@
backup copy of the file
.El
.Sh SEE ALSO
---- a/usr.sbin/nfsd/stablerestart.5
-+++ b/usr.sbin/nfsd/stablerestart.5
+--- a/src/usr.sbin/nfsd/stablerestart.5
++++ b/src/usr.sbin/nfsd/stablerestart.5
@@ -75,10 +75,10 @@
has returned. This might require hardware level caching to be disabled for
a local disk drive that holds the file, or similar.
Modified: trunk/freebsd-utils/debian/pf.examples
===================================================================
--- trunk/freebsd-utils/debian/pf.examples 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/pf.examples 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,9 +1,9 @@
-share/examples/pf/ackpri
-share/examples/pf/faq-example1
-share/examples/pf/faq-example2
-share/examples/pf/faq-example3
-share/examples/pf/queue1
-share/examples/pf/queue2
-share/examples/pf/queue3
-share/examples/pf/queue4
-share/examples/pf/spamd
+src/share/examples/pf/ackpri
+src/share/examples/pf/faq-example1
+src/share/examples/pf/faq-example2
+src/share/examples/pf/faq-example3
+src/share/examples/pf/queue1
+src/share/examples/pf/queue2
+src/share/examples/pf/queue3
+src/share/examples/pf/queue4
+src/share/examples/pf/spamd
Modified: trunk/freebsd-utils/debian/pf.install
===================================================================
--- trunk/freebsd-utils/debian/pf.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/pf.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,4 +1,4 @@
-etc/pf.os /etc
-share/examples/pf/pf.conf /etc
-sbin/pfctl/pfctl /sbin
-usr.sbin/authpf/authpf /usr/sbin/
+src/etc/pf.os /etc
+src/share/examples/pf/pf.conf /etc
+sbin/pfctl /sbin
+usr/sbin/authpf /usr/sbin/
Modified: trunk/freebsd-utils/debian/pf.manpages
===================================================================
--- trunk/freebsd-utils/debian/pf.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/pf.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-contrib/pf/authpf/authpf.8
-contrib/pf/pfctl/pfctl.8
-contrib/pf/man/*.5
+src/contrib/pf/authpf/authpf.8
+src/contrib/pf/pfctl/pfctl.8
+src/contrib/pf/man/*.5
Modified: trunk/freebsd-utils/debian/powerd.install
===================================================================
--- trunk/freebsd-utils/debian/powerd.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/powerd.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1 +1 @@
-usr.sbin/powerd/powerd /usr/sbin/
+usr/sbin/powerd /usr/sbin/
Modified: trunk/freebsd-utils/debian/powerd.manpages
===================================================================
--- trunk/freebsd-utils/debian/powerd.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/powerd.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1 +1 @@
-usr.sbin/powerd/powerd.8
+src/usr.sbin/powerd/powerd.8
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/rules 2013-12-07 22:34:12 UTC (rev 5222)
@@ -2,13 +2,15 @@
# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
# This file is public domain.
+export SHELL = bash
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
CFLAGS = -Wall -g -pipe -fPIC -D_GNU_SOURCE \
-isystem /usr/include/tirpc \
-Werror=implicit-function-declaration \
- -isystem /usr/include/freebsd -I$(CURDIR)/debian/local/include -I$(CURDIR)/include -lbsd \
+ -isystem /usr/include/freebsd -I$(CURDIR)/debian/local/include -I$(CURDIR)/src/include -lbsd \
$(NULL)
CXXFLAGS = $(CFLAGS)
@@ -27,10 +29,11 @@
major := $(shell echo $(version) | sed -e 's/\..*//g')
revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
-SVN := https://svn0.us-west.freebsd.org/base/release/$(version).0
-#SVN := https://svn0.us-west.freebsd.org/base/releng/$(version)
-#SVN := https://svn0.us-west.freebsd.org/base/stable/$(major)
-#SVN := https://svn0.us-west.freebsd.org/base/head
+SVN_BASE := https://svn0.us-west.freebsd.org/base
+SVN := $(SVN_BASE)/release/$(version).0
+#SVN := $(SVN_BASE)/releng/$(version)
+#SVN := $(SVN_BASE)/stable/$(major)
+#SVN := $(SVN_BASE)/base/head
SOURCE = freebsd-utils
ORIGDIR = $(SOURCE)-$(tar_version)
@@ -38,14 +41,29 @@
PATH := /usr/lib/freebsd:$(PATH)
DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" \
- NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
- DESTDIR=$(DESTDIR) make
+PMAKE = \
+ MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
+ CFLAGS="$(CFLAGS)" \
+ NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
+ DESTDIR="$(DESTDIR)" \
+ make -C src $(PMAKE_FLAGS)
+PMAKE_UDEB = \
+ MAKEOBJDIRPREFIX=$(CURDIR)/obj-udeb \
+ CFLAGS="$(CFLAGS) -Os" \
+ NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
+ DESTDIR="$(DESTDIR)-udeb" \
+ make -C src $(PMAKE_FLAGS) -DRESCUE=yes -DWITHOUT_JAIL
-RPCHDRS=include/rpcsvc/nfs_prot.h include/rpcsvc/nlm_prot.h \
- include/rpcsvc/mount.h include/rpcsvc/sm_inter.h \
- sys/kgssapi/gssd.h
+# for ppp
+PMAKE_FLAGS += -DPPP_NO_PAM -DPPP_NO_NAT -DPPP_NO_DES -DPPP_NO_SUID -DPPP_NO_ATM -DPPP_NO_RADIUS
+RPCHDRS= \
+ src/include/rpcsvc/nfs_prot.h \
+ src/include/rpcsvc/nlm_prot.h \
+ src/include/rpcsvc/mount.h \
+ src/include/rpcsvc/sm_inter.h \
+ src/sys/kgssapi/gssd.h
+
.SUFFIXES: .x .h
.x.h:
@@ -56,15 +74,22 @@
get-orig-source:
rm -rf $(ORIGDIR)
mkdir -p \
- $(ORIGDIR)/sys/kern \
- $(ORIGDIR)/sys/amd64/linux32 \
- $(ORIGDIR)/sys/i386/linux \
- $(ORIGDIR)/sys/dev/usb \
- $(ORIGDIR)/etc \
- $(ORIGDIR)/include/rpcsvc \
- $(ORIGDIR)/sys/kgssapi
+ $(ORIGDIR)/src/sys/kern \
+ $(ORIGDIR)/src/sys/amd64/linux32 \
+ $(ORIGDIR)/src/sys/i386/linux \
+ $(ORIGDIR)/src/sys/dev/usb \
+ $(ORIGDIR)/src/sys/kgssapi \
+ $(ORIGDIR)/src/etc \
+ $(ORIGDIR)/src/include/rpcsvc \
+ $(ORIGDIR)/src/{bin,sbin,usr.bin,usr.sbin} \
+ $(NULL)
for i in sbin/dmesg sbin/sysctl \
\
+ bin/Makefile.inc \
+ sbin/Makefile.inc \
+ usr.bin/Makefile.inc \
+ usr.sbin/Makefile.inc \
+ \
usr.bin/kdump \
usr.bin/ktrace \
sys/kern/syscalls.c \
@@ -75,6 +100,7 @@
usr.sbin/jail bin/chflags \
sbin/devd etc/devd.conf etc/devd sys/dev/usb/usbdevs \
usr.sbin/acpi/acpiconf \
+ usr.sbin/acpi/Makefile \
usr.sbin/acpi/Makefile.inc \
sys/contrib/dev/acpica/include \
sbin/kldconfig sbin/kldload sbin/kldstat sbin/kldunload \
@@ -104,190 +130,33 @@
usr.bin/showmount \
usr.sbin/powerd \
; do \
- svn export $(SVN)/$$i $(ORIGDIR)/$$i || exit ; \
+ svn export $(SVN)/$$i $(ORIGDIR)/src/$$i || exit ; \
done
tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
rm -rf $(ORIGDIR)
-build-arch: freebsd-utils gbde kbdcontrol vidcontrol kldutils freebsd-net-tools freebsd-nfs-utils freebsd-ppp powerd
+build-arch: build-deb build-udeb
+build-indep:
+ :
-freebsd-utils: freebsd-utils-stamp
-freebsd-utils-stamp: $(RPCHDRS)
-# $(PMAKE) -C bin/chflags
- $(PMAKE) -C bin/kenv
- $(PMAKE) -C sbin/atacontrol
- $(PMAKE) -C sbin/camcontrol
- $(PMAKE) -C sbin/ccdconfig
- $(PMAKE) -C sbin/devd
- $(PMAKE) -C etc/devd
- $(PMAKE) -C sbin/devfs
- $(PMAKE) -C sbin/dmesg
- $(PMAKE) -C sbin/dumpon
- $(PMAKE) -C sbin/geom
- $(PMAKE) -C sbin/mdconfig
- $(PMAKE) -C sbin/mount
- $(PMAKE) -C sbin/mount_cd9660
- $(PMAKE) -C sbin/mount_ext2fs
- $(PMAKE) -C sbin/mount_hpfs
- $(PMAKE) -C sbin/mount_msdosfs
-# $(PMAKE) -C sbin/mount_nfs
- $(PMAKE) -C sbin/mount_ntfs
- $(PMAKE) -C sbin/mount_nullfs
- $(PMAKE) -C sbin/mount_reiserfs
- $(PMAKE) -C sbin/mount_udf
- $(PMAKE) -C sbin/mount_unionfs
- $(PMAKE) -C sbin/mount_std
- $(PMAKE) -C sbin/savecore
- $(PMAKE) -C sbin/swapon
- $(PMAKE) -C sbin/sysctl
- $(PMAKE) -C sbin/umount
- $(PMAKE) -C usr.bin/kdump
- $(PMAKE) -C usr.bin/ktrace
- $(PMAKE) -C usr.bin/mkuzip
- $(PMAKE) -C usr.sbin/acpi/acpiconf
- $(PMAKE) -C usr.sbin/rpc.umntall
- $(PMAKE) -C usr.sbin/jail
+build-deb: build-deb-stamp
+build-deb-stamp:$(RPCHDRS)
+ $(PMAKE) obj
+ $(PMAKE)
touch $@
-gbde: gbde-stamp
-gbde-stamp:
-# $(PMAKE) -C sbin/gbde
+build-udeb: build-udeb-stamp
+build-udeb-stamp:
+ $(PMAKE_UDEB) obj
+ $(PMAKE_UDEB)
touch $@
-kbdcontrol: kbdcontrol-stamp
-kbdcontrol-stamp:
- $(PMAKE) -C usr.sbin/kbdcontrol
- touch $@
-
-vidcontrol: vidcontrol-stamp
-vidcontrol-stamp:
- $(PMAKE) -C usr.sbin/vidcontrol
- $(PMAKE) -C share/syscons/scrnmaps
- touch $@
-
-kldutils: kldutils-stamp
-kldutils-stamp:
- $(PMAKE) -C sbin/kldconfig
- $(PMAKE) -C sbin/kldload
- $(PMAKE) -C sbin/kldstat
- $(PMAKE) -C sbin/kldunload
- touch $@
-
-freebsd-net-tools: freebsd-net-tools-stamp
-freebsd-net-tools-stamp:
- $(PMAKE) -C sbin/ifconfig -DWITHOUT_JAIL
- $(PMAKE) -C sbin/pfctl
- $(PMAKE) -C sbin/route
- $(PMAKE) -C usr.bin/netstat
- $(PMAKE) -C usr.sbin/arp
- $(PMAKE) -C usr.sbin/authpf
- touch $@
-
-freebsd-ppp: freebsd-ppp-stamp
-freebsd-ppp-stamp:
- $(PMAKE) -C usr.sbin/ppp -DPPP_NO_PAM -DPPP_NO_NAT -DPPP_NO_DES -DPPP_NO_SUID -DPPP_NO_ATM -DPPP_NO_RADIUS
- $(PMAKE) -C usr.sbin/pppctl
- touch $@
-
-freebsd-nfs-utils: freebsd-nfs-utils-stamp
-freebsd-nfs-utils-stamp:
-# $(PMAKE) -C usr.bin/showmount
- $(PMAKE) -C sbin/mount_nfs
- $(PMAKE) -C sbin/nfsiod
-# $(PMAKE) -C usr.sbin/gssd
-# $(PMAKE) -C usr.sbin/nfscbd
-# $(PMAKE) -C usr.sbin/nfsuserd
-# $(PMAKE) -C usr.sbin/nfsrevoke
-# $(PMAKE) -C usr.sbin/nfsdumpstate
- $(PMAKE) -C usr.sbin/rpc.statd
- $(PMAKE) -C usr.sbin/rpc.lockd
- $(PMAKE) -C usr.sbin/mountd
- $(PMAKE) -C usr.sbin/nfsd
- touch $@
-
-powerd: powerd-stamp
-powerd-stamp:
- $(PMAKE) -C usr.sbin/powerd
- touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp:
- touch $@
-
clean:
dh_testdir
dh_testroot
- [ ! -f lib/Makefile ] || $(MAKE) -C lib clean
+ rm -rf obj{-deb,-udeb} debian/tmp-udeb
- $(PMAKE) -C bin/chflags clean
- $(PMAKE) -C bin/kenv clean
- $(PMAKE) -C sbin/ccdconfig clean
- $(PMAKE) -C sbin/atacontrol clean
- $(PMAKE) -C sbin/camcontrol clean
- $(PMAKE) -C sbin/devd clean
- $(PMAKE) -C etc/devd clean
- $(PMAKE) -C sbin/devfs clean
- $(PMAKE) -C sbin/dmesg clean
- $(PMAKE) -C sbin/dumpon clean
- $(PMAKE) -C sbin/geom clean
- $(PMAKE) -C sbin/mdconfig clean
- $(PMAKE) -C sbin/mount clean
- $(PMAKE) -C sbin/mount_cd9660 clean
- $(PMAKE) -C sbin/mount_ext2fs clean
- $(PMAKE) -C sbin/mount_hpfs clean
- $(PMAKE) -C sbin/mount_msdosfs clean
- $(PMAKE) -C sbin/mount_nfs clean
- $(PMAKE) -C sbin/mount_ntfs clean
- $(PMAKE) -C sbin/mount_nullfs clean
- $(PMAKE) -C sbin/mount_reiserfs clean
- $(PMAKE) -C sbin/mount_udf clean
- $(PMAKE) -C sbin/mount_unionfs clean
- $(PMAKE) -C sbin/mount_std clean
- $(PMAKE) -C sbin/savecore clean
- $(PMAKE) -C sbin/swapon clean
- $(PMAKE) -C sbin/sysctl clean
- $(PMAKE) -C sbin/umount clean
- $(PMAKE) -C usr.bin/kdump clean
- $(PMAKE) -C usr.bin/ktrace clean
- $(PMAKE) -C usr.bin/mkuzip clean
- $(PMAKE) -C usr.sbin/acpi/acpiconf clean
- $(PMAKE) -C usr.sbin/rpc.umntall clean
- $(PMAKE) -C usr.sbin/jail clean
-
- $(PMAKE) -C sbin/gbde clean
-
- $(PMAKE) -C usr.sbin/kbdcontrol clean
-
- $(PMAKE) -C usr.sbin/vidcontrol clean
- $(PMAKE) -C share/syscons/scrnmaps clean
-
- $(PMAKE) -C sbin/kldconfig clean
- $(PMAKE) -C sbin/kldload clean
- $(PMAKE) -C sbin/kldstat clean
- $(PMAKE) -C sbin/kldunload clean
-
- $(PMAKE) -C sbin/ifconfig clean
- $(PMAKE) -C sbin/pfctl clean
- $(PMAKE) -C sbin/route clean
- $(PMAKE) -C usr.bin/netstat clean
- $(PMAKE) -C usr.sbin/arp clean
- $(PMAKE) -C usr.sbin/authpf clean
- $(PMAKE) -C usr.sbin/ppp clean
- $(PMAKE) -C usr.sbin/pppctl clean
-
- $(PMAKE) -C sbin/nfsiod clean
- $(PMAKE) -C usr.sbin/gssd clean
- $(PMAKE) -C usr.sbin/nfscbd clean
- $(PMAKE) -C usr.sbin/nfsuserd clean
- $(PMAKE) -C usr.sbin/nfsrevoke clean
- $(PMAKE) -C usr.sbin/nfsdumpstate clean
- $(PMAKE) -C usr.sbin/rpc.statd clean
- $(PMAKE) -C usr.sbin/rpc.lockd clean
- $(PMAKE) -C usr.sbin/mountd clean
- $(PMAKE) -C usr.sbin/nfsd clean
- $(PMAKE) -C usr.sbin/powerd clean
-
$(RM) $(RPCHDRS)
rm -f *stamp
@@ -301,9 +170,15 @@
dh_testroot
dh_prep -a
dh_installdirs -a
+
+ rm -rf debian/tmp-udeb
+
+ mkdir -p debian/tmp{,-udeb}/{{,usr/}{bin,sbin},usr/share/man/man{1,5,8},lib/geom,etc/devd,usr/share/syscons/scrnmaps}
+
+ $(PMAKE) install
+ $(PMAKE_UDEB) install
+
dh_install -a
- mkdir -p debian/freebsd-net-tools/usr/bin
- install -m 2755 -g kmem usr.bin/netstat/netstat debian/freebsd-net-tools/usr/bin/
# Build architecture-independent files here.
binary-indep: build install
Modified: trunk/freebsd-utils/debian/vidcontrol.install
===================================================================
--- trunk/freebsd-utils/debian/vidcontrol.install 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/vidcontrol.install 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1,3 +1,3 @@
-usr.sbin/vidcontrol/vidcontrol /usr/sbin
-share/syscons/fonts/*.fnt /usr/share/syscons/fonts
-share/syscons/scrnmaps/*.scm /usr/share/syscons/scrnmaps
+usr/sbin/vidcontrol /usr/sbin
+src/share/syscons/fonts/*.fnt /usr/share/syscons/fonts
+usr/share/syscons/scrnmaps/*.scm /usr/share/syscons/scrnmaps
Modified: trunk/freebsd-utils/debian/vidcontrol.manpages
===================================================================
--- trunk/freebsd-utils/debian/vidcontrol.manpages 2013-12-07 22:24:58 UTC (rev 5221)
+++ trunk/freebsd-utils/debian/vidcontrol.manpages 2013-12-07 22:34:12 UTC (rev 5222)
@@ -1 +1 @@
-usr.sbin/vidcontrol/vidcontrol.1
+src/usr.sbin/vidcontrol/vidcontrol.1
More information about the Glibc-bsd-commits
mailing list