Re: svn commit: r255437 - in head: cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolaris/uts/common
on 10/09/2013 15:03 Davide Italiano said the following: > The Illumos cv_timedwait_hires() doesn't use 'res' argument so if you > want to be consistent with their behaviour you should pass '0' as > precision argument to cv_timedwait_sbt(). As far as I can see, illumos does use the resolution. -- Andriy Gapon ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255812 - head/sys/dev/iscsi_initiator
Author: trasz Date: Mon Sep 23 10:36:03 2013 New Revision: 255812 URL: http://svnweb.freebsd.org/changeset/base/255812 Log: Prevent "lock (iscsi) sx does not match earlier (sleep mutex) lock" panic triggered by "kldload iscsi_initiator; kldunload iscsi_initiator; kldload iscsi". Approved by: re (marius) Modified: head/sys/dev/iscsi_initiator/iscsi.c Modified: head/sys/dev/iscsi_initiator/iscsi.c == --- head/sys/dev/iscsi_initiator/iscsi.cMon Sep 23 07:53:58 2013 (r255811) +++ head/sys/dev/iscsi_initiator/iscsi.cMon Sep 23 10:36:03 2013 (r255812) @@ -717,7 +717,7 @@ iscsi_start(void) isc = malloc(sizeof(struct isc_softc), M_ISCSI, M_ZERO|M_WAITOK); isc->dev = make_dev(&iscsi_cdevsw, max_sessions, UID_ROOT, GID_WHEEL, 0600, "iscsi"); isc->dev->si_drv1 = isc; - mtx_init(&isc->isc_mtx, "iscsi", NULL, MTX_DEF); + mtx_init(&isc->isc_mtx, "iscsi-isc", NULL, MTX_DEF); TAILQ_INIT(&isc->isc_sess); /* ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r255437 - in head: cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolaris/uts/common
On Mon, Sep 23, 2013 at 9:14 AM, Andriy Gapon wrote: > on 10/09/2013 15:03 Davide Italiano said the following: >> The Illumos cv_timedwait_hires() doesn't use 'res' argument so if you >> want to be consistent with their behaviour you should pass '0' as >> precision argument to cv_timedwait_sbt(). > > As far as I can see, illumos does use the resolution. > > -- > Andriy Gapon Hmm, it looks like I was looking at the wrong version of cv_timedwait_sbt() (the one in lib/libzpool/common/kernel.c), thanks for noticing. That said, I'm not still sure there's an 1:1 mapping between our precision concept and their (but I might be wrong here), and I think gethrestime is not suitable for the amount of precision required. -- Davide "There are no solved problems; there are only problems that are more or less solved" -- Henri Poincare ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r255437 - in head: cddl/contrib/opensolaris/lib/libzpool/common cddl/contrib/opensolaris/lib/libzpool/common/sys sys/cddl/compat/opensolaris/sys sys/cddl/contrib/opensolaris/uts/common
on 23/09/2013 14:41 Davide Italiano said the following: > I think gethrestime is not suitable for the amount of precision > required I agree on this. -- Andriy Gapon ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255815 - head/contrib/libcxxrt
Author: theraven
Date: Mon Sep 23 13:16:21 2013
New Revision: 255815
URL: http://svnweb.freebsd.org/changeset/base/255815
Log:
Import a new libcxxrt. This fixes some potential crashing in the demangler.
Approved by: re (gjb)
MFC after:1 week
Modified:
head/contrib/libcxxrt/libelftc_dem_gnu3.c
head/contrib/libcxxrt/typeinfo.cc
head/contrib/libcxxrt/unwind-itanium.h
Modified: head/contrib/libcxxrt/libelftc_dem_gnu3.c
==
--- head/contrib/libcxxrt/libelftc_dem_gnu3.c Mon Sep 23 11:36:38 2013
(r255814)
+++ head/contrib/libcxxrt/libelftc_dem_gnu3.c Mon Sep 23 13:16:21 2013
(r255815)
@@ -405,6 +405,7 @@ static int cpp_demangle_read_expression_
const char *, size_t, const char *, size_t);
static int cpp_demangle_read_function(struct cpp_demangle_data *, int *,
struct vector_type_qualifier *);
+static int cpp_demangle_local_source_name(struct cpp_demangle_data *ddata);
static int cpp_demangle_read_local_name(struct cpp_demangle_data *);
static int cpp_demangle_read_name(struct cpp_demangle_data *);
static int cpp_demangle_read_nested_name(struct cpp_demangle_data *);
@@ -453,13 +454,22 @@ __cxa_demangle_gnu3(const char *org)
struct cpp_demangle_data ddata;
ssize_t org_len;
unsigned int limit;
- char *rtn;
+ char *rtn = NULL;
if (org == NULL)
return (NULL);
+ org_len = strlen(org);
+ if (org_len > 11 && !strncmp(org, "_GLOBAL__I_", 11)) {
+ if ((rtn = malloc(org_len + 19)) == NULL)
+ return (NULL);
+ snprintf(rtn, org_len + 19,
+ "global constructors keyed to %s", org + 11);
+ return (rtn);
+ }
+
// Try demangling as a type for short encodings
- if (((org_len = strlen(org)) < 2) || (org[0] != '_' || org[1] != 'Z' ))
{
+ if ((org_len < 2) || (org[0] != '_' || org[1] != 'Z' )) {
if (!cpp_demangle_data_init(&ddata, org))
return (NULL);
if (!cpp_demangle_read_type(&ddata, 0))
@@ -467,13 +477,6 @@ __cxa_demangle_gnu3(const char *org)
rtn = vector_str_get_flat(&ddata.output, (size_t *) NULL);
goto clean;
}
- if (org_len > 11 && !strncmp(org, "_GLOBAL__I_", 11)) {
- if ((rtn = malloc(org_len + 19)) == NULL)
- return (NULL);
- snprintf(rtn, org_len + 19,
- "global constructors keyed to %s", org + 11);
- return (rtn);
- }
if (!cpp_demangle_data_init(&ddata, org + 2))
@@ -604,13 +607,12 @@ cpp_demangle_push_fp(struct cpp_demangle
return (0);
rtn = 0;
- if ((len = strlen(f)) > 0 &&
- cpp_demangle_push_str(ddata, f, len))
- rtn = 1;
+ if ((len = strlen(f)) > 0)
+ rtn = cpp_demangle_push_str(ddata, f, len);
free(f);
- return (0);
+ return (rtn);
}
static int
@@ -655,6 +657,7 @@ cpp_demangle_push_subst_v(struct cpp_dem
return (0);
rtn = cpp_demangle_push_subst(ddata, str, str_len);
+
free(str);
return (rtn);
@@ -1868,9 +1871,18 @@ static int
cpp_demangle_read_sname(struct cpp_demangle_data *ddata)
{
long len;
+ int err;
if (ddata == NULL || cpp_demangle_read_number(ddata, &len) == 0 ||
- len <= 0 || cpp_demangle_push_str(ddata, ddata->cur, len) == 0)
+ len <= 0)
+ return (0);
+
+ if (len == 12 && (memcmp("_GLOBAL__N_1", ddata->cur, 12) == 0))
+ err = cpp_demangle_push_str(ddata, "(anonymous namespace)", 21);
+ else
+ err = cpp_demangle_push_str(ddata, ddata->cur, len);
+
+ if (err == 0)
return (0);
assert(ddata->output.size > 0);
@@ -2054,7 +2066,7 @@ clean:
free(subst_str);
vector_str_dest(&v);
- return (1);
+ return (rtn);
}
static int
@@ -2996,6 +3008,40 @@ cpp_demangle_read_uqname(struct cpp_dema
if (ELFTC_ISDIGIT(*ddata->cur) != 0)
return (cpp_demangle_read_sname(ddata));
+
+ /* local source name */
+ if (*ddata->cur == 'L')
+ return (cpp_demangle_local_source_name(ddata));
+
+ return (1);
+}
+
+/*
+ * Read local source name.
+ *
+ * References:
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31775
+ * http://gcc.gnu.org/viewcvs?view=rev&revision=124467
+ */
+static int
+cpp_demangle_local_source_name(struct cpp_demangle_data *ddata)
+{
+ /* L */
+ if (ddata == NULL || *ddata->cur != 'L')
+ return (0);
+ ++ddata->cur;
+
+ /* source name */
+ if (!cpp_demangle_read_sname(ddata))
+ return (0);
+
+ /* d
Re: svn commit: r255809 - in head: etc etc/defaults etc/rc.d share/man/man5 share/man/man8 tools/build/mk usr.sbin/unbound usr.sbin/unbound/local-setup
On 9/22/2013 11:36 PM, Dag-Erling Smørgrav wrote:
> Author: des
> Date: Mon Sep 23 04:36:51 2013
> New Revision: 255809
> URL: http://svnweb.freebsd.org/changeset/base/255809
>
> Log:
> Add a setup script for unbound(8) called local-unbound-setup. It
> generates a configuration suitable for running unbound as a caching
> forwarding resolver, and configures resolvconf(8) to update unbound's
> list of forwarders in addition to /etc/resolv.conf. The initial list
> is taken from the existing resolv.conf, which is rewritten to point to
> localhost. Alternatively, a list of forwarders can be provided on the
> command line.
>
> To assist this script, add an rc.subr command called "enabled" which
> does nothing except return 0 if the service is enabled and 1 if it is
> not, without going through the usual checks. We should consider doing
> the same for "status", which is currently pointless.
>
> Add an rc script for unbound, called local_unbound. If there is no
> configuration file, the rc script runs local-unbound-setup to generate
> one.
>
> Note that these scripts place the unbound configuration files in
> /var/unbound rather than /etc/unbound. This is necessary so that
> unbound can reload its configuration while chrooted. We should
> probably provide symlinks in /etc.
Why not add a link now in etc/Makefile? This would be surprising to not
find unbound.conf in /etc/
Named was doing this as well:
.if ${MK_BIND_MTREE} != "no"
if [ ! -e ${DESTDIR}/etc/namedb ]; then \
ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
fi
.endif
Should use ${INSTALL_SYMLINK} though so brooks' work is used. Patch
attached.
--
Regards,
Bryan Drewery
diff --git etc/Makefile etc/Makefile
index ae52d79..5a6dabd 100644
--- etc/Makefile
+++ etc/Makefile
@@ -247,6 +247,11 @@ distribution:
ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
fi
.endif
+.if ${MK_UNBOUND} != "no"
+ if [ ! -e ${DESTDIR}/etc/unbound ]; then \
+ ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
+ fi
+.endif
.if ${MK_BIND_ETC} != "no"
${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
.endif
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r255775 - head/include
This breaks the build in the peculiar case where you have
a git checkout of some other project, then a FreeBSD SVN
checkout inside of that:
Project/.git
Project/src/ -- FreeBSD source tree.
For some reason newvers.sh is now looking one level too far
up, so it's seeing the dir containing the source tree instead of the
root of the source tree.
This may be related to the use of '.' to run newvers.sh
combined with newvers.sh using $(basename $0) to determine
the script dir, but I haven't dug through in detail yet.
Tim
On Sep 21, 2013, at 3:36 PM, Ian Lepore wrote:
> Author: ian
> Date: Sat Sep 21 22:36:07 2013
> New Revision: 255775
> URL: http://svnweb.freebsd.org/changeset/base/255775
>
> Log:
> Create a separate script to generate osreldate.h rather than sourcing
> newvers.sh into a temporary subshell with inline make rules.
>
> Using a separate script fixes a variety of problems, including establishing
> the correct dependencies in the makefiles. It also eliminates a problem
> with the way newvers.sh uses `realpath $0`, because $0 expands differently
> within a script sourced into a rule in a makefile depending on the version
> of make and of /bin/sh being used. The latter can cause build breakage in a
> cross-build environment, and can also make it difficult to compile 10.0 on
> older pre-10.0 systems.
>
> PR: 160646 174422
> Submitted by:Garrett Cooper
> Approved by: re (gjb)
> MFC after: 2 weeks
>
> Added:
> head/include/mk-osreldate.sh (contents, props changed)
> Modified:
> head/include/Makefile
>
> Modified: head/include/Makefile
> ==
> --- head/include/Makefile Sat Sep 21 22:24:10 2013(r255774)
> +++ head/include/Makefile Sat Sep 21 22:36:07 2013(r255775)
> @@ -104,19 +104,16 @@ SHARED?=copies
>
> INCS+=osreldate.h
>
> -osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh ${.CURDIR}/../sys/sys/param.h
> \
> -${.CURDIR}/Makefile
> - @${ECHO} creating osreldate.h from newvers.sh
> - @MAKE=${MAKE}; \
> - PARAMFILE=${.CURDIR}/../sys/sys/param.h; \
> - . ${.CURDIR}/../sys/conf/newvers.sh; \
> - echo "$$COPYRIGHT" > osreldate.h; \
> - echo "#ifdef _KERNEL" >> osreldate.h; \
> - echo "#error \" cannot be used in the kernel, use
> \"" >> osreldate.h; \
> - echo "#else" >> osreldate.h; \
> - echo "#undef __FreeBSD_version" >> osreldate.h; \
> - echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
> - echo "#endif" >> osreldate.h
> +NEWVERS_SH= ${.CURDIR}/../sys/conf/newvers.sh
> +PARAM_H= ${.CURDIR}/../sys/sys/param.h
> +MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
> +
> +osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
> + env ECHO="${ECHO}" \
> + MAKE="${MAKE}" \
> + NEWVERS_SH=${NEWVERS_SH} \
> + PARAM_H=${PARAM_H} \
> + ${MK_OSRELDATE_SH}
>
> .for i in ${LHDRS}
> INCSLINKS+= sys/$i ${INCLUDEDIR}/$i
>
> Added: head/include/mk-osreldate.sh
> ==
> --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ head/include/mk-osreldate.sh Sat Sep 21 22:36:07 2013
> (r255775)
> @@ -0,0 +1,49 @@
> +#!/bin/sh -
> +# Copyright (c) 2013 Garrett Cooper
> +# All rights reserved.
> +#
> +# Redistribution and use in source and binary forms, with or without
> +# modification, are permitted provided that the following conditions
> +# are met:
> +# 1. Redistributions of source code must retain the above copyright
> +#notice, this list of conditions and the following disclaimer.
> +# 2. Redistributions in binary form must reproduce the above copyright
> +#notice, this list of conditions and the following disclaimer in the
> +#documentation and/or other materials provided with the distribution.
> +#
> +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
> +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> +# SUCH DAMAGE.
> +#
> +# $FreeBSD$
> +
> +set -e
> +
> +CURDIR=$(pwd)
> +ECHO=${ECHO:=echo}
> +
> +tmpfile=$(mktemp osreldate.)
> +trap "rm -f $tmpfile" EXIT
> +
> +${ECHO} creating osreldate.h from newvers.sh
> +
> +export PARAMFILE="${PARAM_H:=
svn commit: r255816 - head/sys/arm/broadcom/bcm2835
Author: loos Date: Mon Sep 23 14:00:18 2013 New Revision: 255816 URL: http://svnweb.freebsd.org/changeset/base/255816 Log: Fix DELAY() on RPi, the wrong math was making it take twice it should. Reported by: Alexander Approved by: adrian (mentor) Approved by: re (gjb) Modified: head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_systimer.c == --- head/sys/arm/broadcom/bcm2835/bcm2835_systimer.cMon Sep 23 13:16:21 2013(r255815) +++ head/sys/arm/broadcom/bcm2835/bcm2835_systimer.cMon Sep 23 14:00:18 2013(r255816) @@ -296,7 +296,7 @@ DELAY(int usec) } /* Get the number of times to count */ - counts = usec * ((bcm_systimer_tc.tc_frequency / 100) + 1); + counts = usec * (bcm_systimer_tc.tc_frequency / 100) + 1; first = bcm_systimer_tc_read_4(SYSTIMER_CLO); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255817 - head/usr.sbin/bsdinstall/partedit
Author: nwhitehorn
Date: Mon Sep 23 14:18:34 2013
New Revision: 255817
URL: http://svnweb.freebsd.org/changeset/base/255817
Log:
Add installer support for CHRP/PAPR PowerPC systems that use MBR+BSD
formatting, like x86, but with an additional MBR slice containing a raw
boot partition.
Approved by: re (gjb)
Modified:
head/usr.sbin/bsdinstall/partedit/gpart_ops.c
head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c
==
--- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Mon Sep 23 14:00:18
2013(r255816)
+++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Mon Sep 23 14:18:34
2013(r255817)
@@ -954,7 +954,8 @@ addpartform:
}
/* If there isn't one, and we need one, ask */
- if (strcmp(items[2].text, "/") == 0 && bootpart_size(scheme) > 0 &&
+ if ((strcmp(items[0].text, "freebsd") == 0 ||
+ strcmp(items[2].text, "/") == 0) && bootpart_size(scheme) > 0 &&
pp == NULL) {
if (interactive)
choice = dialog_yesno("Boot Partition",
Modified: head/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
==
--- head/usr.sbin/bsdinstall/partedit/partedit_powerpc.cMon Sep 23
14:00:18 2013(r255816)
+++ head/usr.sbin/bsdinstall/partedit/partedit_powerpc.cMon Sep 23
14:18:34 2013(r255817)
@@ -59,7 +59,8 @@ is_scheme_bootable(const char *part_type
return (1);
if (strcmp(platform, "ps3") == 0 && strcmp(part_type, "GPT") == 0)
return (1);
- if (strcmp(platform, "chrp") == 0 && strcmp(part_type, "MBR") == 0)
+ if (strcmp(platform, "chrp") == 0 &&
+ (strcmp(part_type, "MBR") == 0 || strcmp(part_type, "BSD") == 0))
return (1);
return (0);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r255775 - head/include
Yeah, I think the moral of this neverending story is that relying on $0
for pathnames is a Bad Idea. Apparently in addition to the patch from
PR 160646, we still need something like the patch I proposed in PR
174422. I'll attach an updated version of that. I've got a test build
running now, I'll see about getting it commited if it fixes the problem
you're seeing.
-- Ian
On Mon, 2013-09-23 at 06:49 -0700, Tim Kientzle wrote:
> This breaks the build in the peculiar case where you have
> a git checkout of some other project, then a FreeBSD SVN
> checkout inside of that:
>
> Project/.git
> Project/src/ -- FreeBSD source tree.
>
> For some reason newvers.sh is now looking one level too far
> up, so it's seeing the dir containing the source tree instead of the
> root of the source tree.
>
> This may be related to the use of '.' to run newvers.sh
> combined with newvers.sh using $(basename $0) to determine
> the script dir, but I haven't dug through in detail yet.
>
> Tim
>
>
>
> On Sep 21, 2013, at 3:36 PM, Ian Lepore wrote:
>
> > Author: ian
> > Date: Sat Sep 21 22:36:07 2013
> > New Revision: 255775
> > URL: http://svnweb.freebsd.org/changeset/base/255775
> >
> > Log:
> > Create a separate script to generate osreldate.h rather than sourcing
> > newvers.sh into a temporary subshell with inline make rules.
> >
> > Using a separate script fixes a variety of problems, including establishing
> > the correct dependencies in the makefiles. It also eliminates a problem
> > with the way newvers.sh uses `realpath $0`, because $0 expands differently
> > within a script sourced into a rule in a makefile depending on the version
> > of make and of /bin/sh being used. The latter can cause build breakage in
> > a
> > cross-build environment, and can also make it difficult to compile 10.0 on
> > older pre-10.0 systems.
> >
> > PR:160646 174422
> > Submitted by: Garrett Cooper
> > Approved by: re (gjb)
> > MFC after: 2 weeks
> >
> > Added:
> > head/include/mk-osreldate.sh (contents, props changed)
> > Modified:
> > head/include/Makefile
> >
> > Modified: head/include/Makefile
> > ==
> > --- head/include/Makefile Sat Sep 21 22:24:10 2013(r255774)
> > +++ head/include/Makefile Sat Sep 21 22:36:07 2013(r255775)
> > @@ -104,19 +104,16 @@ SHARED?= copies
> >
> > INCS+= osreldate.h
> >
> > -osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh
> > ${.CURDIR}/../sys/sys/param.h \
> > -${.CURDIR}/Makefile
> > - @${ECHO} creating osreldate.h from newvers.sh
> > - @MAKE=${MAKE}; \
> > - PARAMFILE=${.CURDIR}/../sys/sys/param.h; \
> > - . ${.CURDIR}/../sys/conf/newvers.sh; \
> > - echo "$$COPYRIGHT" > osreldate.h; \
> > - echo "#ifdef _KERNEL" >> osreldate.h; \
> > - echo "#error \" cannot be used in the kernel, use
> > \"" >> osreldate.h; \
> > - echo "#else" >> osreldate.h; \
> > - echo "#undef __FreeBSD_version" >> osreldate.h; \
> > - echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \
> > - echo "#endif" >> osreldate.h
> > +NEWVERS_SH=${.CURDIR}/../sys/conf/newvers.sh
> > +PARAM_H= ${.CURDIR}/../sys/sys/param.h
> > +MK_OSRELDATE_SH= ${.CURDIR}/mk-osreldate.sh
> > +
> > +osreldate.h vers.c: ${NEWVERS_SH} ${PARAM_H} ${MK_OSRELDATE_SH}
> > + env ECHO="${ECHO}" \
> > + MAKE="${MAKE}" \
> > + NEWVERS_SH=${NEWVERS_SH} \
> > + PARAM_H=${PARAM_H} \
> > + ${MK_OSRELDATE_SH}
> >
> > .for i in ${LHDRS}
> > INCSLINKS+= sys/$i ${INCLUDEDIR}/$i
> >
> > Added: head/include/mk-osreldate.sh
> > ==
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/include/mk-osreldate.shSat Sep 21 22:36:07 2013
> > (r255775)
> > @@ -0,0 +1,49 @@
> > +#!/bin/sh -
> > +# Copyright (c) 2013 Garrett Cooper
> > +# All rights reserved.
> > +#
> > +# Redistribution and use in source and binary forms, with or without
> > +# modification, are permitted provided that the following conditions
> > +# are met:
> > +# 1. Redistributions of source code must retain the above copyright
> > +#notice, this list of conditions and the following disclaimer.
> > +# 2. Redistributions in binary form must reproduce the above copyright
> > +#notice, this list of conditions and the following disclaimer in the
> > +#documentation and/or other materials provided with the distribution.
> > +#
> > +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
> > +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> > +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
> > PURPOSE
> > +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
> > +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> > CONSEQUENTIAL
> > +#
Re: svn commit: r255809 - in head: etc etc/defaults etc/rc.d share/man/man5 share/man/man8 tools/build/mk usr.sbin/unbound usr.sbin/unbound/local-setup
Bryan Drewery writes: > Why not add a link now in etc/Makefile? This would be surprising to not > find unbound.conf in /etc/ Yep, I'm going to do that, but I need to figure out how not to break installworld for people who already have /etc/unbound (since it's currently in BSD.root.mtree). DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255818 - in head/usr.sbin/bsdconfig: examples share/media
Author: dteske
Date: Mon Sep 23 16:47:52 2013
New Revision: 255818
URL: http://svnweb.freebsd.org/changeset/base/255818
Log:
Fix a bug in HTTP checking/fetching.
Fix a bug in HTTP checking/fetching. Add Main Site to HTTP menu. Add new
example script browse_packages_http.sh and move existing example script
browse_packages.sh -> browse_packages_ftp.sh
Reviewed by: gjb, brd
Approved by: re (gjb), clusteradm (brd)
MFC after:3 days
Added:
head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh
- copied unchanged from r255712,
head/usr.sbin/bsdconfig/examples/browse_packages.sh
head/usr.sbin/bsdconfig/examples/browse_packages_http.sh (contents, props
changed)
Deleted:
head/usr.sbin/bsdconfig/examples/browse_packages.sh
Modified:
head/usr.sbin/bsdconfig/examples/Makefile
head/usr.sbin/bsdconfig/share/media/http.subr
Modified: head/usr.sbin/bsdconfig/examples/Makefile
==
--- head/usr.sbin/bsdconfig/examples/Makefile Mon Sep 23 14:18:34 2013
(r255817)
+++ head/usr.sbin/bsdconfig/examples/Makefile Mon Sep 23 16:47:52 2013
(r255818)
@@ -3,7 +3,7 @@
NO_OBJ=
FILESDIR= ${SHAREDIR}/examples/bsdconfig
-FILES= browse_packages.sh bsdconfigrc
+FILES= browse_packages_ftp.sh browse_packages_http.sh bsdconfigrc
beforeinstall:
mkdir -p ${DESTDIR}${FILESDIR}
Copied: head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh (from r255712,
head/usr.sbin/bsdconfig/examples/browse_packages.sh)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/bsdconfig/examples/browse_packages_ftp.sh Mon Sep 23
16:47:52 2013(r255818, copy of r255712,
head/usr.sbin/bsdconfig/examples/browse_packages.sh)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# This sample downloads the package INDEX file from FTP to /tmp (if it doesn't
+# already exist) and then displays the package configuration/management screen
+# using the local INDEX file (results in faster browsing of packages from-start
+# since the INDEX can be loaded from local media).
+#
+# NOTE: Packages cannot be installed unless staged to /tmp/packages/All
+#
+. /usr/share/bsdconfig/script.subr
+nonInteractive=1
+TMPDIR=/tmp
+if [ ! -e "$TMPDIR/packages/INDEX" ]; then
+ [ -d "$TMPDIR/packages" ] || mkdir -p "$TMPDIR/packages" || exit 1
+ _ftpPath=ftp://ftp.freebsd.org
+ # For older releases, use ftp://ftp-archive.freebsd.org
+ mediaSetFTP
+ mediaOpen
+ f_show_info "Downloading packages/INDEX from\n %s" "$_ftpPath"
+ f_device_get media packages/INDEX > $TMPDIR/packages/INDEX
+fi
+_directoryPath=$TMPDIR
+mediaSetDirectory
+configPackages
Added: head/usr.sbin/bsdconfig/examples/browse_packages_http.sh
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/bsdconfig/examples/browse_packages_http.shMon Sep 23
16:47:52 2013(r255818)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# This sample downloads the package INDEX file from HTTP to /tmp (if it doesn't
+# already exist) and then displays the package configuration/management screen
+# using the local INDEX file (results in faster browsing of packages from-start
+# since the INDEX can be loaded from local media).
+#
+# NOTE: Packages cannot be installed unless staged to /tmp/packages/All
+#
+. /usr/share/bsdconfig/script.subr
+nonInteractive=1
+TMPDIR=/tmp
+if [ ! -e "$TMPDIR/packages/INDEX" ]; then
+ [ -d "$TMPDIR/packages" ] || mkdir -p "$TMPDIR/packages" || exit 1
+ _httpPath=http://ftp.freebsd.org
+ # For older releases, use http://ftp-archive.freebsd.org
+ mediaSetHTTP
+ mediaOpen
+ f_show_info "Downloading packages/INDEX from\n %s" "$_httpPath"
+ f_device_get media packages/INDEX > $TMPDIR/packages/INDEX
+fi
+_directoryPath=$TMPDIR
+mediaSetDirectory
+configPackages
Modified: head/usr.sbin/bsdconfig/share/media/http.subr
==
--- head/usr.sbin/bsdconfig/share/media/http.subr Mon Sep 23 14:18:34
2013(r255817)
+++ head/usr.sbin/bsdconfig/share/media/http.subr Mon Sep 23 16:47:52
2013(r255818)
@@ -77,7 +77,8 @@ f_dialog_menu_media_http()
f_dialog_title_restore
local prompt="$msg_please_select_the_site_closest_to_you_or_other"
local menu_list="
- 'URL' '$msg_specify_some_other_http_site'
+ '$msg_main_site' 'ftp.freebsd.org'
+ 'URL' '$msg_specify_some_other_http_site'
" # END-QUOTE
local hline="$msg_select_a_site_thats_close"
@@ -390,8 +391,12 @@ f_http_check_access()
f_show_info "$msg_checking_access_to" "$http_path"
loca
svn commit: r255821 - head/usr.sbin/arp
Author: glebius
Date: Mon Sep 23 18:12:25 2013
New Revision: 255821
URL: http://svnweb.freebsd.org/changeset/base/255821
Log:
Fix coredump on 'arp -d'.
Submitted by: az
Approved by: re (kib)
Modified:
head/usr.sbin/arp/arp.c
Modified: head/usr.sbin/arp/arp.c
==
--- head/usr.sbin/arp/arp.c Mon Sep 23 18:12:19 2013(r255820)
+++ head/usr.sbin/arp/arp.c Mon Sep 23 18:12:25 2013(r255821)
@@ -187,8 +187,11 @@ main(int argc, char *argv[])
if (argc != 0)
usage();
search(0, nuke_entry);
- } else
+ } else {
+ if (argc != 1)
+ usage();
rtn = delete(argv[0]);
+ }
break;
case F_FILESET:
if (argc != 1)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255819 - head/usr.sbin/unbound/local-setup
Author: des
Date: Mon Sep 23 17:35:23 2013
New Revision: 255819
URL: http://svnweb.freebsd.org/changeset/base/255819
Log:
Ensure that resolvconf(8) preserves the edns0 setting.
Approved by: re (blanket)
Modified:
head/usr.sbin/unbound/local-setup/local-unbound-setup.sh
Modified: head/usr.sbin/unbound/local-setup/local-unbound-setup.sh
==
--- head/usr.sbin/unbound/local-setup/local-unbound-setup.shMon Sep 23
16:47:52 2013(r255818)
+++ head/usr.sbin/unbound/local-setup/local-unbound-setup.shMon Sep 23
17:35:23 2013(r255819)
@@ -157,6 +157,7 @@ gen_resolv_conf() {
gen_resolvconf_conf() {
echo "# Generated by $self"
echo "name_servers=\"127.0.0.1\""
+ echo "resolv_conf_options=\"edns0\""
echo "unbound_conf=\"${forward_conf}\""
echo "unbound_pid=\"${pidfile}\""
echo "unbound_service=\"${service}\""
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r255809 - in head: etc etc/defaults etc/rc.d share/man/man5 share/man/man8 tools/build/mk usr.sbin/unbound usr.sbin/unbound/local-setup
Dag-Erling Smørgrav writes: > Bryan Drewery writes: > > Why not add a link now in etc/Makefile? This would be surprising to not > > find unbound.conf in /etc/ > Yep, I'm going to do that, but I need to figure out how not to break > installworld for people who already have /etc/unbound (since it's > currently in BSD.root.mtree). To elaborate: my original plan was to have the configuration in /etc/unbound and things like the root anchor and unbound-control keys (which I still haven't hooked up) in /var/unbound, which is why /var/unbound was originally 0750 (it is now 0755). Unfortunately, this doesn't work, because all of this needs to be inside the chroot, and unbound refuses to start unless it is. The only alternative is to not chroot it, which is a questionable decision, to put it mildly. So there's no escaping placing everything either in /etc/unbound or in /var/unbound. I'm not sure which poison I prefer. I also need to change the rcorder so unbound starts much earlier. I should probably just have NETWORKING require local_unbound require netif, and then try to figure out whether local_unbound requires resolv or the other way around, since local_unbound plays reindeer games with resolvconf on first start. DES -- Dag-Erling Smørgrav - d...@des.no ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255824 - in head/sys: cam/ctl dev/iscsi
Author: trasz
Date: Mon Sep 23 19:54:44 2013
New Revision: 255824
URL: http://svnweb.freebsd.org/changeset/base/255824
Log:
Don't use M_WAITOK when running from context where sleeping is prohibited,
such as callout or a geom thread.
Approved by: re (marius)
Sponsored by: FreeBSD Foundation
Modified:
head/sys/cam/ctl/ctl_frontend_iscsi.c
head/sys/dev/iscsi/iscsi.c
Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c
==
--- head/sys/cam/ctl/ctl_frontend_iscsi.c Mon Sep 23 18:53:48 2013
(r255823)
+++ head/sys/cam/ctl/ctl_frontend_iscsi.c Mon Sep 23 19:54:44 2013
(r255824)
@@ -930,7 +930,11 @@ cfiscsi_callout(void *context)
if (cs->cs_timeout < 2)
return;
- cp = icl_pdu_new_bhs(cs->cs_conn, M_WAITOK);
+ cp = icl_pdu_new_bhs(cs->cs_conn, M_NOWAIT);
+ if (cp == NULL) {
+ CFISCSI_SESSION_WARN(cs, "failed to allocate PDU");
+ return;
+ }
bhsni = (struct iscsi_bhs_nop_in *)cp->ip_bhs;
bhsni->bhsni_opcode = ISCSI_BHS_OPCODE_NOP_IN;
bhsni->bhsni_flags = 0x80;
@@ -2245,7 +2249,7 @@ cfiscsi_datamove(union ctl_io *io)
struct ctl_sg_entry ctl_sg_entry, *ctl_sglist;
size_t copy_len, len, off;
const char *addr;
- int ctl_sg_count, i;
+ int ctl_sg_count, error, i;
uint32_t target_transfer_tag;
bool done;
@@ -2298,7 +2302,13 @@ cfiscsi_datamove(union ctl_io *io)
KASSERT(i < ctl_sg_count, ("i >= ctl_sg_count"));
if (response == NULL) {
response =
- cfiscsi_pdu_new_response(request, M_WAITOK);
+ cfiscsi_pdu_new_response(request, M_NOWAIT);
+ if (response == NULL) {
+ CFISCSI_SESSION_WARN(cs, "failed to "
+ "allocate memory; dropping
connection");
+ cfiscsi_session_terminate(cs);
+ return;
+ }
bhsdi = (struct iscsi_bhs_data_in *)
response->ip_bhs;
bhsdi->bhsdi_opcode =
@@ -2323,7 +2333,14 @@ cfiscsi_datamove(union ctl_io *io)
copy_len = cs->cs_max_data_segment_length -
response->ip_data_len;
KASSERT(copy_len <= len, ("copy_len > len"));
- icl_pdu_append_data(response, addr, copy_len, M_WAITOK);
+ error = icl_pdu_append_data(response, addr, copy_len,
M_NOWAIT);
+ if (error != 0) {
+ CFISCSI_SESSION_WARN(cs, "failed to "
+ "allocate memory; dropping connection");
+ icl_pdu_free(response);
+ cfiscsi_session_terminate(cs);
+ return;
+ }
addr += copy_len;
len -= copy_len;
off += copy_len;
Modified: head/sys/dev/iscsi/iscsi.c
==
--- head/sys/dev/iscsi/iscsi.c Mon Sep 23 18:53:48 2013(r255823)
+++ head/sys/dev/iscsi/iscsi.c Mon Sep 23 19:54:44 2013(r255824)
@@ -558,7 +558,11 @@ iscsi_callout(void *context)
if (is->is_timeout < 2)
return;
- request = icl_pdu_new_bhs(is->is_conn, M_WAITOK);
+ request = icl_pdu_new_bhs(is->is_conn, M_NOWAIT);
+ if (request == NULL) {
+ ISCSI_SESSION_WARN(is, "failed to allocate PDU");
+ return;
+ }
bhsno = (struct iscsi_bhs_nop_out *)request->ip_bhs;
bhsno->bhsno_opcode = ISCSI_BHS_OPCODE_NOP_OUT |
ISCSI_BHS_OPCODE_IMMEDIATE;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255825 - head/etc/rc.d
Author: des Date: Mon Sep 23 20:03:23 2013 New Revision: 255825 URL: http://svnweb.freebsd.org/changeset/base/255825 Log: Move local_unbound up in the rc order. Approved by: re (blanket) Modified: head/etc/rc.d/local_unbound Modified: head/etc/rc.d/local_unbound == --- head/etc/rc.d/local_unbound Mon Sep 23 19:54:44 2013(r255824) +++ head/etc/rc.d/local_unbound Mon Sep 23 20:03:23 2013(r255825) @@ -4,7 +4,7 @@ # # PROVIDE: local_unbound -# REQUIRE: SERVERS cleanvar +# REQUIRE: FILESYSTEMS netif resolv # KEYWORD: shutdown . /etc/rc.subr ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255826 - head/usr.sbin/unbound/local-setup
Author: des
Date: Mon Sep 23 20:06:59 2013
New Revision: 255826
URL: http://svnweb.freebsd.org/changeset/base/255826
Log:
Prevent resolvconf from updating /etc/resolv.conf. As Jakob Schlyter
pointed out, having additional nameservers listed in /etc/resolv.conf
can break DNSSEC verification by providing a false positive if unbound
returns SERVFAIL due to an invalid signature. The downside is that
the domain / search path won't get updated either, but we can live
with that.
Approved by: re (blanket)
Modified:
head/usr.sbin/unbound/local-setup/local-unbound-setup.sh
Modified: head/usr.sbin/unbound/local-setup/local-unbound-setup.sh
==
--- head/usr.sbin/unbound/local-setup/local-unbound-setup.shMon Sep 23
20:03:23 2013(r255825)
+++ head/usr.sbin/unbound/local-setup/local-unbound-setup.shMon Sep 23
20:06:59 2013(r255826)
@@ -156,14 +156,12 @@ gen_resolv_conf() {
#
gen_resolvconf_conf() {
echo "# Generated by $self"
- echo "name_servers=\"127.0.0.1\""
- echo "resolv_conf_options=\"edns0\""
+ echo "resolv_conf=\"/dev/null\" # prevent updating ${resolv_conf}"
echo "unbound_conf=\"${forward_conf}\""
echo "unbound_pid=\"${pidfile}\""
echo "unbound_service=\"${service}\""
- # resolvconf(8) likes to restart rather than reload - consider
- # forcing its hand?
- #echo "unbound_restart=\"service ${service} reload\""
+ # resolvconf(8) likes to restart rather than reload
+ echo "unbound_restart=\"service ${service} reload\""
}
#
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255827 - in head/sys: amd64/amd64 i386/i386
Author: kib
Date: Mon Sep 23 20:14:15 2013
New Revision: 255827
URL: http://svnweb.freebsd.org/changeset/base/255827
Log:
Free both KVA and backing pages when freeing TSS memory.
Reported and tested by: pho
Sponsored by: The FreeBSD Foundation
Approved by: re (marius)
Modified:
head/sys/amd64/amd64/vm_machdep.c
head/sys/i386/i386/vm_machdep.c
Modified: head/sys/amd64/amd64/vm_machdep.c
==
--- head/sys/amd64/amd64/vm_machdep.c Mon Sep 23 20:06:59 2013
(r255826)
+++ head/sys/amd64/amd64/vm_machdep.c Mon Sep 23 20:14:15 2013
(r255827)
@@ -341,7 +341,7 @@ cpu_thread_clean(struct thread *td)
* Clean TSS/iomap
*/
if (pcb->pcb_tssp != NULL) {
- kva_free((vm_offset_t)pcb->pcb_tssp,
+ kmem_free(kernel_arena, (vm_offset_t)pcb->pcb_tssp,
ctob(IOPAGES + 1));
pcb->pcb_tssp = NULL;
}
Modified: head/sys/i386/i386/vm_machdep.c
==
--- head/sys/i386/i386/vm_machdep.c Mon Sep 23 20:06:59 2013
(r255826)
+++ head/sys/i386/i386/vm_machdep.c Mon Sep 23 20:14:15 2013
(r255827)
@@ -367,7 +367,7 @@ cpu_thread_clean(struct thread *td)
* XXX do we need to move the TSS off the allocated pages
* before freeing them? (not done here)
*/
- kva_free((vm_offset_t)pcb->pcb_ext,
+ kmem_free(kernel_arena, (vm_offset_t)pcb->pcb_ext,
ctob(IOPAGES + 1));
pcb->pcb_ext = NULL;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255828 - head/share/man/man4
Author: hiren
Date: Mon Sep 23 20:30:25 2013
New Revision: 255828
URL: http://svnweb.freebsd.org/changeset/base/255828
Log:
Correcting EXAMPLES section.
Approved by: re (gjb)
Modified:
head/share/man/man4/netmap.4
Modified: head/share/man/man4/netmap.4
==
--- head/share/man/man4/netmap.4Mon Sep 23 20:14:15 2013
(r255827)
+++ head/share/man/man4/netmap.4Mon Sep 23 20:30:25 2013
(r255828)
@@ -28,7 +28,7 @@
.\" $FreeBSD$
.\" $Id: netmap.4 11563 2012-08-02 08:59:12Z luigi $:
stable/8/share/man/man4/bpf.4 181694 2008-08-13 17:45:06Z ed $
.\"
-.Dd February 27, 2012
+.Dd September 23, 2013
.Dt NETMAP 4
.Os
.Sh NAME
@@ -267,14 +267,14 @@ The following code implements a traffic
#include
struct netmap_if *nifp;
struct netmap_ring *ring;
-struct netmap_request nmr;
+struct nmreq nmr;
fd = open("/dev/netmap", O_RDWR);
bzero(&nmr, sizeof(nmr));
-strcpy(nmr.nm_name, "ix0");
-nmr.nm_version = NETMAP_API;
+strcpy(nmr.nr_name, "ix0");
+nmr.nr_version = NETMAP_API;
ioctl(fd, NIOCREG, &nmr);
-p = mmap(0, nmr.memsize, fd);
+p = mmap(0, nmr.nr_memsize, fd);
nifp = NETMAP_IF(p, nmr.offset);
ring = NETMAP_TXRING(nifp, 0);
fds.fd = fd;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r255829 - in head: crypto/openssh secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd
Author: des Date: Mon Sep 23 20:35:54 2013 New Revision: 255829 URL: http://svnweb.freebsd.org/changeset/base/255829 Log: Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius) Added: head/crypto/openssh/freebsd-configure.sh (contents, props changed) head/crypto/openssh/krb5_config.h (contents, props changed) Modified: head/crypto/openssh/FREEBSD-upgrade head/crypto/openssh/config.h head/crypto/openssh/ssh-gss.h head/crypto/openssh/sshd.c head/secure/lib/libssh/Makefile head/secure/usr.bin/ssh/Makefile head/secure/usr.sbin/sshd/Makefile Modified: head/crypto/openssh/FREEBSD-upgrade == --- head/crypto/openssh/FREEBSD-upgrade Mon Sep 23 20:30:25 2013 (r255828) +++ head/crypto/openssh/FREEBSD-upgrade Mon Sep 23 20:35:54 2013 (r255829) @@ -3,7 +3,13 @@ FreeBSD maintainer's guide to OpenSSH-portable == -[needs rewriting for svn] +XXX +XXX this needs a complete rewrite +XXX svn merge from vendor branch, resolve conflicts manually +XXX (see FREEBSD-tricks for tips on how to reduce conflicts) +XXX run freebsd-configure.sh to generate config.h and krb5_config.h +XXX svn diff Makefile.in to see if the Makefiles need adjusting +XXX 0) Make sure your mail spool has plenty of free space. It'll fill up pretty fast once you're done with this checklist. @@ -116,7 +122,7 @@ B) Re-commit everything on repoman (you This port was brought to you by (in no particular order) DARPA, NAI -Labs, ThinkSec, Nescaf�, the Aberlour Glenlivet Distillery Co., +Labs, ThinkSec, Nescafé, the Aberlour Glenlivet Distillery Co., Suzanne Vega, and a Sanford's #69 Deluxe Marker. -- d...@freebsd.org Modified: head/crypto/openssh/config.h == --- head/crypto/openssh/config.hMon Sep 23 20:30:25 2013 (r255828) +++ head/crypto/openssh/config.hMon Sep 23 20:35:54 2013 (r255829) @@ -157,7 +157,7 @@ /* #undef GLOB_HAS_GL_STATV */ /* Define this if you want GSSAPI support in the version 2 protocol */ -#define GSSAPI 1 +/* #undef GSSAPI */ /* Define if you want to use shadow password expire field */ /* #undef HAS_SHADOW_EXPIRE */ @@ -271,7 +271,7 @@ /* Define to 1 if you have the declaration of `GSS_C_NT_HOSTBASED_SERVICE', and to 0 if you don't. */ -#define HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE 1 +/* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */ /* Define to 1 if you have the declaration of `howmany', and to 0 if you don't. */ @@ -535,10 +535,10 @@ /* #undef HAVE_GSSAPI_GSSAPI_GENERIC_H */ /* Define to 1 if you have the header file. */ -#define HAVE_GSSAPI_GSSAPI_H 1 +/* #undef HAVE_GSSAPI_GSSAPI_H */ /* Define to 1 if you have the header file. */ -#define HAVE_GSSAPI_GSSAPI_KRB5_H 1 +/* #undef HAVE_GSSAPI_GSSAPI_KRB5_H */ /* Define to 1 if you have the header file. */ /* #undef HAVE_GSSAPI_H */ @@ -601,13 +601,13 @@ #define HAVE_ISBLANK 1 /* Define to 1 if you have the `krb5_cc_new_unique' function. */ -#define HAVE_KRB5_CC_NEW_UNIQUE 1 +/* #undef HAVE_KRB5_CC_NEW_UNIQUE */ /* Define to 1 if you have the `krb5_free_error_message' function. */ -#define HAVE_KRB5_FREE_ERROR_MESSAGE 1 +/* #undef HAVE_KRB5_FREE_ERROR_MESSAGE */ /* Define to 1 if you have the `krb5_get_error_message' function. */ -#define HAVE_KRB5_GET_ERROR_MESSAGE 1 +/* #undef HAVE_KRB5_GET_ERROR_MESSAGE */ /* Define to 1 if you have the header file. */ /* #undef HAVE_LASTLOG_H */ @@ -1310,7 +1310,7 @@ #define HAVE___func__ 1 /* Define this if you are using the Heimdal version of Kerberos V5 */ -#define HEIMDAL 1 +/* #undef HEIMDAL */ /* Define if you need to use IP address instead of hostname in $DISPLAY */ /* #undef IPADDR_IN_DISPLAY */ @@ -1322,7 +1322,7 @@ /* #undef IP_TOS_IS_BROKEN */ /* Define if you want Kerberos 5 support */ -#define KRB5 1 +/* #undef KRB5 */ /* Define if pututxline updates lastlog too */ /* #undef LASTLOG_WRITE_PUTUTXLINE */ Added: head/crypto/openssh/freebsd-configure.sh == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/crypto/openssh/freebsd-configure.shMon Sep 23 20:35:54 2013 (r255829) @@ -0,0 +1,30 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +configure_args=" +--prefix=/usr +--sysconfdir=/etc/ssh +--with-pam +--with-tcp-wrappers +--with-libedit +--with-ssl-engine +--without-xauth +" + +set -e + +# generate config.h w
svn commit: r255833 - in head: share/misc usr.bin/calendar/calendars
Author: danilo (ports committer) Date: Tue Sep 24 04:00:49 2013 New Revision: 255833 URL: http://svnweb.freebsd.org/changeset/base/255833 Log: - Add myself as port commiter and my mentors relationship. - Add myself to calendar.freebsd. Approved by: re (gjb), wg (mentor) Modified: head/share/misc/committers-ports.dot head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotTue Sep 24 02:47:18 2013 (r255832) +++ head/share/misc/committers-ports.dotTue Sep 24 04:00:49 2013 (r255833) @@ -77,6 +77,7 @@ cs [label="Carlo Strub\n...@freebsd.org\n culot [label="Frederic Culot\ncu...@freebsd.org\n2010/10/16"] daichi [label="Daichi Goto\ndai...@freebsd.org\n2002/10/17"] danfe [label="Alexey Dokuchaev\nda...@freebsd.org\n2004/08/20"] +danilo [label="Danilo E. Gondolfo\ndan...@freebsd.org\n2013/09/23"] db [label="Diane Bruce\n...@freebsd.org\n2007/01/18"] dbn [label="David Naylor\n...@freebsd.org\n2013/01/14"] decke [label="Bernhard Froehlich\nde...@freebsd.org\n2010/03/21"] @@ -278,9 +279,10 @@ crees -> madpilot crees -> gblach crees -> tijl +culot -> danilo culot -> jase -culot -> wg culot -> marino +culot -> wg db -> tj @@ -532,6 +534,7 @@ wen -> cs wen -> culot wen -> pawel +wg -> danilo wg -> nemysis will -> lioux Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdTue Sep 24 02:47:18 2013(r255832) +++ head/usr.bin/calendar/calendars/calendar.freebsdTue Sep 24 04:00:49 2013(r255833) @@ -329,6 +329,7 @@ 11/09 Coleman Kane born in Cincinnati, Ohio, United States, 1980 11/09 Antoine Brodin born in Bagnolet, France, 1981 11/10 Gregory Neil Shapiro born in Providence, Rhode Island, United States, 1970 +11/11 Danilo E. Gondolfo born in Lobato, Parana, Brazil, 1987 11/13 John Baldwin born in Stuart, Virginia, United States, 1977 11/14 Jeremie Le Hen born in Nancy, France, 1980 11/15 Lars Engels born in Hilden, Nordrhein-Westfalen, Germany, 1980 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
