[Glibc-bsd-commits] r5986 - in trunk/freebsd-utils/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Mon Apr 4 11:52:05 UTC 2016
Author: stevenc-guest
Date: 2016-04-04 11:52:05 +0000 (Mon, 04 Apr 2016)
New Revision: 5986
Modified:
trunk/freebsd-utils/debian/changelog
trunk/freebsd-utils/debian/patches/017_sysctl.diff
trunk/freebsd-utils/debian/patches/022_devd.diff
trunk/freebsd-utils/debian/patches/026_kdump.diff
trunk/freebsd-utils/debian/patches/035_nfs.diff
trunk/freebsd-utils/debian/patches/fstype_alias.diff
trunk/freebsd-utils/debian/patches/makefiles.diff
trunk/freebsd-utils/debian/patches/netstat_maddrs.diff
trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff
Log:
Refresh patches:
- 017_sysctl.diff
- 022_devd.diff
- 026_kdump.diff
- 035_nfs.diff
- makefiles.diff
- netstat_maddrs.diff
- netstat_oqdrops.diff
- fstype_alias.diff
Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/changelog 2016-04-04 11:52:05 UTC (rev 5986)
@@ -1,6 +1,15 @@
freebsd-utils (10.3~svn296373-1) UNRELEASED; urgency=medium
* New upstream snapshot of 10.3-RC3
+ * Refresh patches:
+ - 017_sysctl.diff
+ - 022_devd.diff
+ - 026_kdump.diff
+ - 035_nfs.diff
+ - makefiles.diff
+ - netstat_maddrs.diff
+ - netstat_oqdrops.diff
+ - fstype_alias.diff
* Use XZ to compress orig source tarball
* Make get-orig-source tarball reproducible
* Use new preferred hostname for upstream SVN with HTTPS
Modified: trunk/freebsd-utils/debian/patches/017_sysctl.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/017_sysctl.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/017_sysctl.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -4,7 +4,7 @@
--- a/src/sbin/sysctl/sysctl.c
+++ b/src/sbin/sysctl/sysctl.c
-@@ -58,6 +58,7 @@
+@@ -67,6 +67,7 @@
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
@@ -12,15 +12,15 @@
static const char *conffile;
-@@ -473,6 +474,7 @@
+@@ -492,6 +493,7 @@
static int
- S_loadavg(int l2, void *p)
+ S_loadavg(size_t l2, void *p)
{
+#if 0
struct loadavg *tv = (struct loadavg*)p;
if (l2 != sizeof(*tv)) {
-@@ -483,6 +485,7 @@
+@@ -502,6 +504,7 @@
(double)tv->ldavg[0]/(double)tv->fscale,
(double)tv->ldavg[1]/(double)tv->fscale,
(double)tv->ldavg[2]/(double)tv->fscale);
Modified: trunk/freebsd-utils/debian/patches/022_devd.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/022_devd.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/022_devd.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -1,8 +1,6 @@
-Index: freebsd-utils-jessie/src/etc/devd.conf
-===================================================================
---- freebsd-utils-jessie.orig/src/etc/devd.conf
-+++ freebsd-utils-jessie/src/etc/devd.conf
-@@ -13,7 +13,6 @@ options {
+--- a/src/etc/devd.conf
++++ b/src/etc/devd.conf
+@@ -13,7 +13,6 @@
# that they are returned from readdir(3). The rule-sets are combined
# to create a DFA that's used to match events to actions.
directory "/etc/devd";
@@ -10,7 +8,7 @@
pid-file "/var/run/devd.pid";
# Setup some shorthand for regex that we use later in the file.
-@@ -27,84 +26,6 @@ options {
+@@ -27,84 +26,6 @@
# Note that the attach/detach with the highest value wins, so that one can
# override these general rules.
@@ -95,7 +93,7 @@
# When a USB keyboard arrives, attach it as the console keyboard.
attach 100 {
device-name "ukbd0";
-@@ -115,42 +36,6 @@ detach 100 {
+@@ -115,42 +36,6 @@
action "/etc/rc.d/syscons setkeyboard /dev/kbd0";
};
@@ -138,7 +136,7 @@
# Firmware download into the ActiveWire board. After the firmware download is
# done, the device detaches and reappears as something new and shiny
# automatically.
-@@ -229,13 +114,6 @@ nomatch 10 {
+@@ -229,13 +114,6 @@
vendor $vendor bus $bus";
};
@@ -152,8 +150,8 @@
# Notify all users before beginning emergency shutdown when we get
# a _CRT or _HOT thermal event and we're going to power down the system
# very soon.
-@@ -277,19 +155,6 @@ notify 10 {
- action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'";
+@@ -246,19 +124,6 @@
+ action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'";
};
-# User requested suspend, so perform preparation steps and then execute
Modified: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -1,16 +1,14 @@
-Index: freebsd-utils-jessie/src/usr.bin/kdump/kdump.c
-===================================================================
---- freebsd-utils-jessie.orig/src/usr.bin/kdump/kdump.c
-+++ freebsd-utils-jessie/src/usr.bin/kdump/kdump.c
-@@ -56,6 +56,7 @@ extern int errno;
+--- a/src/usr.bin/kdump/kdump.c
++++ b/src/usr.bin/kdump/kdump.c
+@@ -56,6 +56,7 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/stat.h>
+#include "stat16.h"
#include <sys/sysent.h>
+ #include <sys/umtx.h>
#include <sys/un.h>
- #include <sys/queue.h>
-@@ -71,6 +72,8 @@ extern int errno;
+@@ -72,6 +73,8 @@
#include <netinet/in.h>
#include <ctype.h>
#include <dlfcn.h>
@@ -19,8 +17,8 @@
#include <err.h>
#include <grp.h>
#include <inttypes.h>
-@@ -106,7 +109,7 @@ void ktruser_rtld(int, unsigned char *);
- void ktruser(int, unsigned char *);
+@@ -107,7 +110,7 @@
+ void ktruser(int, void *);
void ktrcaprights(cap_rights_t *);
void ktrsockaddr(struct sockaddr *);
-void ktrstat(struct stat *);
@@ -28,7 +26,7 @@
void ktrstruct(char *, size_t);
void ktrcapfail(struct ktr_cap_fail *);
void ktrfault(struct ktr_fault *);
-@@ -1175,6 +1178,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in
+@@ -1189,6 +1192,7 @@
ip++;
narg--;
break;
@@ -36,39 +34,28 @@
case SYS_procctl:
putchar('(');
idtypename(*ip, decimal);
-@@ -1187,6 +1191,7 @@ ktrsyscall(struct ktr_syscall *ktr, u_in
+@@ -1201,6 +1205,7 @@
ip++;
narg--;
break;
+#endif
- }
- }
- while (narg > 0) {
-@@ -1661,7 +1666,7 @@ ktrsockaddr(struct sockaddr *sa)
- }
-
- void
--ktrstat(struct stat *statp)
-+ktrstat(struct stat16 *statp)
- {
- char mode[12], timestr[PATH_MAX + 4];
- struct passwd *pwd;
-Index: freebsd-utils-jessie/src/usr.bin/kdump/Makefile
-===================================================================
---- freebsd-utils-jessie.orig/src/usr.bin/kdump/Makefile
-+++ freebsd-utils-jessie/src/usr.bin/kdump/Makefile
-@@ -18,6 +18,9 @@ CFLAGS+= -I${.CURDIR}/../ktrace -I${.CUR
+ case SYS__umtx_op:
+ print_number(ip, narg, c);
+ putchar(',');
+--- a/src/usr.bin/kdump/Makefile
++++ b/src/usr.bin/kdump/Makefile
+@@ -13,6 +13,9 @@
CFLAGS+=-DPF
.endif
+CFLAGS+= -Wno-error=implicit-function-declaration
+LDADD+= -lfreebsd-glue
+
- .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
- SRCS+= linux_syscalls.c
- .endif
-@@ -28,14 +31,14 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_s
+ NO_WERROR?= YES
+ CLEANFILES= ioctl.c kdump_subr.c kdump_subr.h
+@@ -26,14 +29,14 @@
+
ioctl.c: mkioctls
env MACHINE=${MACHINE} CPP="${CPP}" \
- sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET}
@@ -82,14 +69,12 @@
kdump_subr.c: mksubr kdump_subr.h
- sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET}
+ sh ${.CURDIR}/mksubr /usr/src/kfreebsd-headers-10.1-0/sys >${.TARGET}
-
- linux_syscalls.c:
- /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
-Index: freebsd-utils-jessie/src/usr.bin/kdump/mksubr
-===================================================================
---- freebsd-utils-jessie.orig/src/usr.bin/kdump/mksubr
-+++ freebsd-utils-jessie/src/usr.bin/kdump/mksubr
-@@ -80,7 +80,10 @@ _EOF_
+ .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386")
+ sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
+ ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux/syscalls.master ${.CURDIR}/linux_syscalls.conf
+--- a/src/usr.bin/kdump/mksubr
++++ b/src/usr.bin/kdump/mksubr
+@@ -80,7 +80,10 @@
if ($i ~ /define/) \
break; \
++i; \
@@ -101,7 +86,7 @@
cat <<_EOF_
printf(">");
if (or == 0)
-@@ -113,7 +116,10 @@ _EOF_
+@@ -113,7 +116,10 @@
if ($i ~ /define/) \
break; \
++i; \
@@ -113,7 +98,7 @@
cat <<_EOF_
default: /* Should not reach */
printf("<invalid=%jd>", arg);
-@@ -141,10 +147,14 @@ $name(intmax_t arg)
+@@ -141,10 +147,14 @@
_EOF_
egrep "^#[[:space:]]*define[[:space:]]+"${grep}"[[:space:]]*" \
$include_dir/$file | \
@@ -130,7 +115,7 @@
cat <<_EOF_
else /* Should not reach */
printf("<invalid=%jd>", arg);
-@@ -161,6 +171,7 @@ cat <<_EOF_
+@@ -162,6 +172,7 @@
#include <sys/fcntl.h>
#include <sys/stat.h>
#include <sys/unistd.h>
@@ -138,7 +123,7 @@
#include <sys/mman.h>
#include <sys/wait.h>
#define _KERNEL
-@@ -175,11 +186,7 @@ cat <<_EOF_
+@@ -176,11 +187,7 @@
#include <sys/reboot.h>
#include <sched.h>
#include <sys/linker.h>
@@ -150,7 +135,7 @@
#include <aio.h>
#include <sys/sem.h>
#include <sys/ipc.h>
-@@ -193,6 +200,20 @@ cat <<_EOF_
+@@ -196,6 +203,20 @@
#include "kdump_subr.h"
@@ -171,7 +156,7 @@
/*
* These are simple support macros. print_or utilizes a variable
* defined in the calling function to track whether or not it should
-@@ -336,6 +357,7 @@ idtypename(idtype_t idtype, int decimal)
+@@ -339,6 +360,7 @@
case P_PID:
printf("P_PID");
break;
@@ -179,7 +164,7 @@
case P_PPID:
printf("P_PPID");
break;
-@@ -381,6 +403,7 @@ idtypename(idtype_t idtype, int decimal)
+@@ -384,6 +406,7 @@
case P_PSETID:
printf("P_PSETID");
break;
@@ -187,7 +172,7 @@
default:
if (decimal) {
printf("%d", idtype);
-@@ -438,10 +461,14 @@ vmprotname (int type)
+@@ -441,10 +464,14 @@
void
socktypenamewithflags(int type)
{
@@ -202,7 +187,7 @@
socktypename(type);
}
_EOF_
-@@ -456,7 +483,7 @@ auto_or_type "flockname" "
+@@ -459,7 +486,7 @@
auto_or_type "getfsstatflagsname" "MNT_[A-Z]+[[:space:]]+[1-9][0-9]*" "sys/mount.h"
auto_switch_type "kldsymcmdname" "KLDSYM_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h"
auto_switch_type "kldunloadfflagsname" "LINKER_UNLOAD_[A-Z]+[[:space:]]+[0-9]+" "sys/linker.h"
@@ -211,7 +196,7 @@
auto_switch_type "madvisebehavname" "_?MADV_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h"
auto_switch_type "minheritname" "INHERIT_[A-Z]+[[:space:]]+[0-9]+" "sys/mman.h"
auto_or_type "mlockallname" "MCL_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h"
-@@ -472,7 +499,7 @@ auto_switch_type "quotactlname" "
+@@ -475,7 +502,7 @@
auto_or_type "rebootoptname" "RB_[A-Z]+[[:space:]]+0x[0-9]+" "sys/reboot.h"
auto_or_type "rforkname" "RF[A-Z]+[[:space:]]+\([0-9]+<<[0-9]+\)" "sys/unistd.h"
auto_switch_type "rlimitname" "RLIMIT_[A-Z]+[[:space:]]+[0-9]+" "sys/resource.h"
@@ -220,7 +205,7 @@
auto_switch_type "sendfileflagsname" "SF_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h"
auto_or_type "shmatname" "SHM_[A-Z]+[[:space:]]+[0-9]{6}+" "sys/shm.h"
auto_switch_type "shutdownhowname" "SHUT_[A-Z]+[[:space:]]+[0-9]+" "sys/socket.h"
-@@ -511,7 +538,11 @@ egrep "^#[[:space:]]*define[[:space:]]+F
+@@ -515,7 +542,11 @@
break; \
++i; \
if (o <= $(i+1)) \
@@ -232,7 +217,7 @@
else \
exit; \
o = $(i+1) }'
-@@ -549,7 +580,6 @@ cat <<_EOF_
+@@ -553,7 +584,6 @@
void
mmapflagsname(int flags)
{
@@ -240,7 +225,7 @@
int or = 0;
printf("%#x<", flags);
_EOF_
-@@ -559,13 +589,17 @@ egrep "^#[[:space:]]*define[[:space:]]+M
+@@ -563,13 +593,17 @@
if ($i ~ /define/) \
break; \
++i; \
@@ -260,7 +245,7 @@
if (align != 0) {
if (align == MAP_ALIGNED_SUPER)
print_or("MAP_ALIGNED_SUPER", or);
-@@ -577,6 +611,7 @@ cat <<_EOF_
+@@ -581,6 +615,7 @@
printf(">");
if (or == 0)
printf("<invalid>%d", flags);
@@ -268,7 +253,7 @@
}
/*
-@@ -628,7 +663,10 @@ egrep "^#[[:space:]]*define[[:space:]]+M
+@@ -632,7 +667,10 @@
if ($i ~ /define/) \
break; \
++i; \
@@ -280,7 +265,7 @@
cat <<_EOF_
printf(">");
}
-@@ -649,7 +687,10 @@ egrep "^#[[:space:]]*define[[:space:]]+S
+@@ -653,7 +691,10 @@
if ($i ~ /define/) \
break; \
++i; \
@@ -292,10 +277,8 @@
cat <<_EOF_
default:
switch (sig) {
-Index: freebsd-utils-jessie/src/usr.bin/kdump/stat16.h
-===================================================================
--- /dev/null
-+++ freebsd-utils-jessie/src/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.
Modified: trunk/freebsd-utils/debian/patches/035_nfs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/035_nfs.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/035_nfs.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -1,8 +1,8 @@
--- a/src/sbin/mount_nfs/mount_nfs.c
+++ b/src/sbin/mount_nfs/mount_nfs.c
-@@ -694,12 +694,18 @@
+@@ -484,12 +484,18 @@
static int
- sec_name_to_num(char *sec)
+ sec_name_to_num(const char *sec)
{
+#ifdef RPCSEC_GSS_KRB5
if (!strcmp(sec, "krb5"))
@@ -19,7 +19,7 @@
if (!strcmp(sec, "sys"))
return (AUTH_SYS);
return (-1);
-@@ -709,12 +715,18 @@
+@@ -499,12 +505,18 @@
sec_num_to_name(int flavor)
{
switch (flavor) {
@@ -38,7 +38,7 @@
case AUTH_SYS:
return ("sys");
}
-@@ -859,9 +871,11 @@
+@@ -649,9 +661,11 @@
freeaddrinfo(ai_nfs);
build_iovec(iov, iovlen, "hostname", nam, (size_t)-1);
@@ -52,7 +52,7 @@
--- a/src/usr.sbin/mountd/mountd.c
+++ b/src/usr.sbin/mountd/mountd.c
-@@ -2116,12 +2116,18 @@
+@@ -2198,12 +2198,18 @@
if (!strcmp(seclist, "sys"))
flavor = AUTH_SYS;
Modified: trunk/freebsd-utils/debian/patches/fstype_alias.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/fstype_alias.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/fstype_alias.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -4,7 +4,7 @@
--- a/src/sbin/mount/mount.c
+++ b/src/sbin/mount/mount.c
-@@ -584,6 +584,26 @@
+@@ -592,6 +592,26 @@
"Using \"-t msdosfs\", since \"-t msdos\" is deprecated.");
vfstype = "msdosfs";
}
Modified: trunk/freebsd-utils/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/makefiles.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/makefiles.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -11,7 +11,7 @@
.include <bsd.subdir.mk>
--- a/src/sbin/ifconfig/Makefile
+++ b/src/sbin/ifconfig/Makefile
-@@ -38,6 +38,8 @@
+@@ -43,6 +43,8 @@
DPADD+= ${LIBBSDXML} ${LIBSBUF}
LDADD+= -lbsdxml -lsbuf
@@ -22,7 +22,7 @@
.if ${MK_PF} != "no"
--- a/src/usr.sbin/ppp/Makefile
+++ b/src/usr.sbin/ppp/Makefile
-@@ -38,10 +38,10 @@
+@@ -41,10 +41,10 @@
BINMODE=4554
BINOWN= root
.endif
Modified: trunk/freebsd-utils/debian/patches/netstat_maddrs.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/netstat_maddrs.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/netstat_maddrs.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -5,7 +5,7 @@
--- a/src/usr.bin/netstat/if.c
+++ b/src/usr.bin/netstat/if.c
-@@ -202,6 +202,7 @@
+@@ -194,6 +194,7 @@
}
}
@@ -13,7 +13,7 @@
/*
* Find next multiaddr for a given interface name.
*/
-@@ -220,6 +221,7 @@
+@@ -212,6 +213,7 @@
return (ifma);
}
@@ -21,16 +21,17 @@
/*
* Print a description of the network interfaces.
-@@ -228,15 +230,19 @@
+@@ -220,7 +222,9 @@
intpr(int interval, void (*pfunc)(char *), int af)
{
struct ifaddrs *ifap, *ifa;
+#if 0
struct ifmaddrs *ifmap, *ifma;
+#endif
-
+ u_int ifn_len_max = 5;
+
if (interval)
- return sidewaysintpr(interval);
+@@ -228,8 +232,10 @@
if (getifaddrs(&ifap) != 0)
err(EX_OSERR, "getifaddrs");
@@ -39,9 +40,9 @@
err(EX_OSERR, "getifmaddrs");
+#endif
- if (!pfunc) {
- if (Wflag)
-@@ -390,6 +396,7 @@
+ if (Wflag) {
+ for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+@@ -388,6 +394,7 @@
if (!aflag)
continue;
@@ -49,7 +50,7 @@
/*
* Print family's multicast addresses.
*/
-@@ -449,11 +456,14 @@
+@@ -447,11 +454,14 @@
ifma = ifma->ifma_next;
}
Modified: trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff 2016-04-04 11:36:42 UTC (rev 5985)
+++ trunk/freebsd-utils/debian/patches/netstat_oqdrops.diff 2016-04-04 11:52:05 UTC (rev 5986)
@@ -5,18 +5,18 @@
--- a/src/usr.bin/netstat/if.c
+++ b/src/usr.bin/netstat/if.c
-@@ -389,8 +389,10 @@
+@@ -387,8 +387,10 @@
if (bflag)
- show_stat("lu", 10, IFA_STAT(obytes), link|network);
- show_stat("NRSlu", 5, IFA_STAT(collisions), link);
+ show_stat("lu", 10, IFA_STAT(obytes), link|network, 0);
+ show_stat("NRSlu", 5, IFA_STAT(collisions), link, 1);
+#if 0
if (dflag)
- show_stat("LSlu", 5, IFA_STAT(oqdrops), link);
+ show_stat("LSlu", 5, IFA_STAT(oqdrops), link, 1);
+#endif
putchar('\n');
if (!aflag)
-@@ -508,7 +510,9 @@
+@@ -506,7 +508,9 @@
st->ift_ib += IFA_STAT(ibytes);
st->ift_op += IFA_STAT(opackets);
st->ift_oe += IFA_STAT(oerrors);
More information about the Glibc-bsd-commits
mailing list