svn commit: r234697 - head
Author: ru Date: Thu Apr 26 09:07:32 2012 New Revision: 234697 URL: http://svn.freebsd.org/changeset/base/234697 Log: Fixed a misspelling of OLD_LIBS in r232671 by pluknet@. (The patch in the PR 165523 had this spelled correctly.) Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Apr 26 08:37:51 2012(r234696) +++ head/ObsoleteFiles.inc Thu Apr 26 09:07:32 2012(r234697) @@ -459,7 +459,7 @@ OLD_FILES+=usr/share/man/man5/lastlog.5. OLD_FILES+=usr/share/man/man5/utmp.5.gz OLD_FILES+=usr/share/man/man5/wtmp.5.gz OLD_LIBS+=lib/libutil.so.8 -OLB_LIBS+=usr/lib32/libutil.so.8 +OLD_LIBS+=usr/lib32/libutil.so.8 # 20100105: new userland semaphore implementation OLD_FILES+=usr/include/sys/semaphore.h # 20100103: ntptrace(8) removed ___ 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: r234697 - head
On 26 April 2012 13:07, Ruslan Ermilov wrote: > Author: ru > Date: Thu Apr 26 09:07:32 2012 > New Revision: 234697 > URL: http://svn.freebsd.org/changeset/base/234697 > > Log: > Fixed a misspelling of OLD_LIBS in r232671 by pluknet@. > (The patch in the PR 165523 had this spelled correctly.) > > Modified: > head/ObsoleteFiles.inc > > Modified: head/ObsoleteFiles.inc > == > --- head/ObsoleteFiles.inc Thu Apr 26 08:37:51 2012 (r234696) > +++ head/ObsoleteFiles.inc Thu Apr 26 09:07:32 2012 (r234697) > @@ -459,7 +459,7 @@ OLD_FILES+=usr/share/man/man5/lastlog.5. > OLD_FILES+=usr/share/man/man5/utmp.5.gz > OLD_FILES+=usr/share/man/man5/wtmp.5.gz > OLD_LIBS+=lib/libutil.so.8 > -OLB_LIBS+=usr/lib32/libutil.so.8 > +OLD_LIBS+=usr/lib32/libutil.so.8 > # 20100105: new userland semaphore implementation > OLD_FILES+=usr/include/sys/semaphore.h > # 20100103: ntptrace(8) removed Apparently I was on drugs. Thanks. -- wbr, pluknet ___ 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: r234699 - head/sys/netinet
Author: tuexen
Date: Thu Apr 26 11:07:15 2012
New Revision: 234699
URL: http://svn.freebsd.org/changeset/base/234699
Log:
Fix a type in an SCTP AUTH related notification. Keep the old name
for backwards compatibility.
Spotted by Irene Ruengeler.
MFC after: 3 days
Modified:
head/sys/netinet/sctp_auth.c
head/sys/netinet/sctp_uio.h
head/sys/netinet/sctputil.c
Modified: head/sys/netinet/sctp_auth.c
==
--- head/sys/netinet/sctp_auth.cThu Apr 26 09:14:52 2012
(r234698)
+++ head/sys/netinet/sctp_auth.cThu Apr 26 11:07:15 2012
(r234699)
@@ -1801,7 +1801,7 @@ sctp_handle_auth(struct sctp_tcb *stcb,
* shared_key_id, (void
* *)stcb->asoc.authinfo.recv_keyid);
*/
- sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY,
+ sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY,
shared_key_id, stcb->asoc.authinfo.recv_keyid,
SCTP_SO_NOT_LOCKED);
/* compute a new recv assoc key and cache it */
Modified: head/sys/netinet/sctp_uio.h
==
--- head/sys/netinet/sctp_uio.h Thu Apr 26 09:14:52 2012(r234698)
+++ head/sys/netinet/sctp_uio.h Thu Apr 26 11:07:15 2012(r234699)
@@ -424,7 +424,8 @@ struct sctp_authkey_event {
};
/* indication values */
-#define SCTP_AUTH_NEWKEY 0x0001
+#define SCTP_AUTH_NEW_KEY 0x0001
+#define SCTP_AUTH_NEWKEY SCTP_AUTH_NEW_KEY
#define SCTP_AUTH_NO_AUTH 0x0002
#define SCTP_AUTH_FREE_KEY 0x0003
Modified: head/sys/netinet/sctputil.c
==
--- head/sys/netinet/sctputil.c Thu Apr 26 09:14:52 2012(r234698)
+++ head/sys/netinet/sctputil.c Thu Apr 26 11:07:15 2012(r234699)
@@ -3531,7 +3531,7 @@ sctp_ulp_notify(uint32_t notification, s
sctp_notify_shutdown_event(stcb);
break;
case SCTP_NOTIFY_AUTH_NEW_KEY:
- sctp_notify_authentication(stcb, SCTP_AUTH_NEWKEY, error,
+ sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, error,
(uint16_t) (uintptr_t) data,
so_locked);
break;
___
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: r234686 - head/lib/libusb
On 25. Apr 2012, at 21:50 , Hans Petter Selasky wrote: > Author: hselasky > Date: Wed Apr 25 21:50:20 2012 > New Revision: 234686 > URL: http://svn.freebsd.org/changeset/base/234686 > > Log: > Bump the libusb major version due to the last commit, which > changes the libusb 1.0 API. While at it, correct a manual > page symlink. > > Suggested by:kib @ Why don't we use symver for the library yet? http://people.freebsd.org/~deischen/symver/freebsd_versioning.txt > > Modified: > head/lib/libusb/Makefile > > Modified: head/lib/libusb/Makefile > == > --- head/lib/libusb/Makefile Wed Apr 25 18:07:35 2012(r234685) > +++ head/lib/libusb/Makefile Wed Apr 25 21:50:20 2012(r234686) > @@ -5,7 +5,7 @@ > # > > LIB= usb > -SHLIB_MAJOR= 2 > +SHLIB_MAJOR= 3 > SHLIB_MINOR= 0 > SRCS= libusb20.c > SRCS+=libusb20_desc.c > @@ -70,7 +70,7 @@ MLINKS += libusb.3 libusb_detach_kernel_ > MLINKS += libusb.3 libusb_detach_kernel_driver_np.3 > MLINKS += libusb.3 libusb_attach_kernel_driver.3 > MLINKS += libusb.3 libusb_get_device_descriptor.3 > -MLINKS += libusb.3 libsub_get_active_config_descriptor.3 > +MLINKS += libusb.3 libusb_get_active_config_descriptor.3 > MLINKS += libusb.3 libusb_get_config_descriptor.3 > MLINKS += libusb.3 libusb_get_config_descriptor_by_value.3 > MLINKS += libusb.3 libusb_free_config_descriptor.3 -- Bjoern A. Zeeb You have to have visions! It does not matter how good you are. It matters what good you do! ___ 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: r234686 - head/lib/libusb
On Thu, 26 Apr 2012 11:23:15 + "Bjoern A. Zeeb" wrote: > > On 25. Apr 2012, at 21:50 , Hans Petter Selasky wrote: > > > Author: hselasky > > Date: Wed Apr 25 21:50:20 2012 > > New Revision: 234686 > > URL: http://svn.freebsd.org/changeset/base/234686 > > > > Log: > > Bump the libusb major version due to the last commit, which > > changes the libusb 1.0 API. While at it, correct a manual > > page symlink. > > > > Suggested by: kib @ > > > Why don't we use symver for the library yet? > http://people.freebsd.org/~deischen/symver/freebsd_versioning.txt > Symbol versions make sense if one can provide backward-compatible implementation for old symbol versions. If that is not possible or desirable, major version bump is the right answer. -- Alexander Kabaev signature.asc Description: PGP signature
svn commit: r234700 - head/lib/libc/gen
Author: eadler Date: Thu Apr 26 12:59:08 2012 New Revision: 234700 URL: http://svn.freebsd.org/changeset/base/234700 Log: Document the standardization status of err* and warn* PR: docs/164939 Submitted by: Niclas Zeising Approved by: bcr MFC after:3 days Modified: head/lib/libc/gen/err.3 Modified: head/lib/libc/gen/err.3 == --- head/lib/libc/gen/err.3 Thu Apr 26 11:07:15 2012(r234699) +++ head/lib/libc/gen/err.3 Thu Apr 26 12:59:08 2012(r234700) @@ -28,7 +28,7 @@ .\"From: @(#)err.3 8.1 (Berkeley) 6/9/93 .\" $FreeBSD$ .\" -.Dd March 6, 1999 +.Dd March 29, 2012 .Dt ERR 3 .Os .Sh NAME @@ -212,6 +212,16 @@ if (error != 0) .Xr printf 3 , .Xr strerror 3 , .Xr sysexits 3 +.Sh STANDARDS +The +.Fn err +and +.Fn warn +families of functions are BSD extensions. +As such they should not be used in truly portable code. +Use +.Fn strerror +or similar functions instead. .Sh HISTORY The .Fn err ___ 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: r234701 - head/contrib/traceroute
Author: tuexen Date: Thu Apr 26 13:45:17 2012 New Revision: 234701 URL: http://svn.freebsd.org/changeset/base/234701 Log: Fix a bug in the TCP tracerouting which resulted in not accepting any incoming packets. So all packets seemed to be lost. MFC after: 1 week Modified: head/contrib/traceroute/traceroute.c Modified: head/contrib/traceroute/traceroute.c == --- head/contrib/traceroute/traceroute.cThu Apr 26 12:59:08 2012 (r234700) +++ head/contrib/traceroute/traceroute.cThu Apr 26 13:45:17 2012 (r234701) @@ -1406,8 +1406,7 @@ tcp_prep(struct outdata *outdata) tcp->th_sport = htons(ident); tcp->th_dport = htons(port + (fixedPort ? 0 : outdata->seq)); - tcp->th_seq = (tcp->th_sport << 16) | (tcp->th_dport + - (fixedPort ? outdata->seq : 0)); + tcp->th_seq = (tcp->th_sport << 16) | tcp->th_dport; tcp->th_ack = 0; tcp->th_off = 5; tcp->th_flags = TH_SYN; @@ -1425,8 +1424,8 @@ tcp_check(const u_char *data, int seq) struct tcphdr *const tcp = (struct tcphdr *) data; return (ntohs(tcp->th_sport) == ident - && ntohs(tcp->th_dport) == port + (fixedPort ? 0 : seq)) - && tcp->th_seq == (((tcp_seq)ident << 16) | (port + seq)); + && ntohs(tcp->th_dport) == port + (fixedPort ? 0 : seq) + && tcp->th_seq == (tcp_seq)((tcp->th_sport << 16) | tcp->th_dport)); } void ___ 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: r234709 - head
Author: hselasky Date: Thu Apr 26 14:34:46 2012 New Revision: 234709 URL: http://svn.freebsd.org/changeset/base/234709 Log: Add libusb.so.2 to obsolete files. Suggested by: dumbbell @ Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Apr 26 14:02:39 2012(r234708) +++ head/ObsoleteFiles.inc Thu Apr 26 14:34:46 2012(r234709) @@ -633,6 +633,7 @@ OLD_LIBS+=usr/lib/libssl.so.5 OLD_LIBS+=usr/lib/libtacplus.so.3 OLD_LIBS+=usr/lib/libugidfw.so.3 OLD_LIBS+=usr/lib/libusb.so.1 +OLD_LIBS+=usr/lib/libusb.so.2 OLD_LIBS+=usr/lib/libusbhid.so.3 OLD_LIBS+=usr/lib/libvgl.so.5 OLD_LIBS+=usr/lib/libwrap.so.5 @@ -734,6 +735,7 @@ OLD_LIBS+=usr/lib32/libufs.so.4 OLD_LIBS+=usr/lib32/libugidfw.so.3 OLD_LIBS+=usr/lib32/libumem.so.1 OLD_LIBS+=usr/lib32/libusb.so.1 +OLD_LIBS+=usr/lib32/libusb.so.2 OLD_LIBS+=usr/lib32/libusbhid.so.3 OLD_LIBS+=usr/lib32/libutil.so.7 OLD_LIBS+=usr/lib32/libuutil.so.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"
Re: svn commit: r234709 - head
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 26.04.2012 16:34, Hans Petter Selasky wrote: > Modified: head/ObsoleteFiles.inc OLD_LIBS+=usr/lib/libusb.so.1 > +OLD_LIBS+=usr/lib/libusb.so.2 Entries are sorted by date (recent first), not alphabetically. You should move your modifications to the top of the file, adding a comment with the date and the reason. See for example the last entry following clang update: # 20120415: new clang import which bumps version from 3.0 to 3.1 - -- Jean-Sébastien Pédron -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.19 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk+ZYc8ACgkQa+xGJsFYOlNm5ACfTcHj/Pwy4jF+lagTXQjz0lmE FcIAnipVqp6w0QYMOmEjJ9ibRXmOwXov =W05t -END PGP SIGNATURE- ___ 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: r234711 - in head/usr.sbin/wpa: . hostapd
Author: bschmidt
Date: Thu Apr 26 17:35:11 2012
New Revision: 234711
URL: http://svn.freebsd.org/changeset/base/234711
Log:
fix EAP server support after the 0.7.3 import:
- eap_xxx.c files have been renamed to eap_server_xxx.c
- additional crypto files are required for some options
- EAP_MD5 and EAP_GTC is now enabled by default to match vendor config
- move each file on its own line to hopefully make further diffs easier
to read
EAP_SERVER is now enabled by default. Fiddling with HOSTAPD_CFLAGS in
src.conf is no longer required to get a basic WPA-EAP/radius setup
running.
Tested by:Johann Hugo
MFC after:2 weeks
Modified:
head/usr.sbin/wpa/Makefile.inc
head/usr.sbin/wpa/hostapd/Makefile
Modified: head/usr.sbin/wpa/Makefile.inc
==
--- head/usr.sbin/wpa/Makefile.inc Thu Apr 26 14:51:12 2012
(r234710)
+++ head/usr.sbin/wpa/Makefile.inc Thu Apr 26 17:35:11 2012
(r234711)
@@ -7,17 +7,23 @@ WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/w
HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd
.PATH.c:${.CURDIR}/.. \
+ ${WPA_DISTDIR}/src/ap \
${WPA_DISTDIR}/src/common \
${WPA_DISTDIR}/src/crypto \
+ ${WPA_DISTDIR}/src/eapol_auth \
${WPA_DISTDIR}/src/eap_common \
+ ${WPA_DISTDIR}/src/eap_server \
${WPA_DISTDIR}/src/eapol_supp \
${WPA_DISTDIR}/src/l2_packet \
+ ${WPA_DISTDIR}/src/radius \
${WPA_DISTDIR}/src/utils
CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${HOSTAPD_DISTDIR}
CFLAGS+=-I${WPA_DISTDIR}/src
CFLAGS+=-I${WPA_DISTDIR}/src/common
CFLAGS+=-I${WPA_DISTDIR}/src/crypto
+CFLAGS+=-I${WPA_DISTDIR}/src/drivers
CFLAGS+=-I${WPA_DISTDIR}/src/l2_packet
CFLAGS+=-I${WPA_DISTDIR}/src/utils
Modified: head/usr.sbin/wpa/hostapd/Makefile
==
--- head/usr.sbin/wpa/hostapd/Makefile Thu Apr 26 14:51:12 2012
(r234710)
+++ head/usr.sbin/wpa/hostapd/Makefile Thu Apr 26 17:35:11 2012
(r234711)
@@ -2,33 +2,59 @@
.include "${.CURDIR}/../Makefile.inc"
-.PATH.c:${HOSTAPD_DISTDIR} \
- ${WPA_DISTDIR}/src/ap \
- ${WPA_DISTDIR}/src/eap_server \
- ${WPA_DISTDIR}/src/eap_common \
- ${WPA_DISTDIR}/src/eapol_auth \
- ${WPA_DISTDIR}/src/drivers \
- ${WPA_DISTDIR}/src/radius \
- ${WPA_DISTDIR}
+.PATH.c:${WPA_DISTDIR}/src/drivers
PROG= hostapd
-SRCS= accounting.c aes-wrap.c ap_config.c \
- ap_drv_ops.c ap_mlme.c authsrv.c \
- chap.c common.c config_file.c ctrl_iface.c crypto_openssl.c \
- ctrl_iface_ap.c drivers.c drv_callbacks.c dump_state.c \
- eap_common.c eap_peap_common.c eap_register.c eap_server.c \
- eap_server_gtc.c eap_server_identity.c eap_server_md5.c \
- eap_server_methods.c eap_server_mschapv2.c eap_server_peap.c \
- eap_server_tls.c eap_server_tls_common.c eap_server_ttls.c \
- eapol_auth_dump.c eapol_auth_sm.c eloop.c hostapd.c ieee802_11_auth.c \
- ieee802_11_common.c ieee802_11_ht.c ieee802_1x.c ip_addr.c \
- md5.c main.c ms_funcs.c peerkey_auth.c pmksa_cache_auth.c \
- preauth_auth.c radius.c radius_client.c sta_info.c \
- sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c \
- tkip_countermeasures.c utils.c \
- vlan_init.c wpa_auth.c wpa_auth_glue.c wpa_auth_ie.c wpa_common.c \
- wpa_debug.c wpabuf.c
-SRCS+= l2_packet_freebsd.c driver_freebsd.c os_unix.c
+SRCS= accounting.c \
+ aes-wrap.c \
+ ap_config.c \
+ ap_drv_ops.c \
+ ap_mlme.c \
+ authsrv.c \
+ chap.c \
+ common.c \
+ config_file.c \
+ crypto_openssl.c \
+ ctrl_iface.c \
+ ctrl_iface_ap.c \
+ drivers.c \
+ drv_callbacks.c \
+ eap_common.c \
+ eap_peap_common.c \
+ eap_register.c \
+ eapol_auth_dump.c \
+ eapol_auth_sm.c \
+ eap_server.c \
+ eap_server_methods.c \
+ eloop.c \
+ hostapd.c \
+ ieee802_11_auth.c \
+ ieee802_11_common.c \
+ ieee802_1x.c \
+ ip_addr.c \
+ main.c \
+ md5.c \
+ ms_funcs.c \
+ os_unix.c \
+ peerkey_auth.c \
+ pmksa_cache_auth.c \
+ preauth_auth.c \
+ radius.c \
+ radius_client.c \
+ sha1-pbkdf2.c \
+ sha1-tlsprf.c \
+ sha1.c \
+ sta_info.c \
+ tkip_countermeasures.c \
+ utils.c \
+ vlan_init.c \
+ wpa_auth.c \
+ wpa_auth_glue.c \
+ wpa_auth_ie.c \
+ wpa_common.c \
+ wpa_debug.c \
+ wpabuf.c
+SRCS+= l2_packet_freebsd.c driver_freebsd.c
MAN= hostapd.8 hostapd.conf.5
@@ -38,10 +64,11 @@ FILESDIR= ${SHAREDIR}/examples/hostapd
FILES= hostapd.conf hostapd.eap_user hostapd.wpa_psk
.endif
-CFLAGS+= -I${HOSTAPD_DISTDIR} -I${WPA_DISTDIR}/src/drivers
-
-CFLAGS+= -DCONFIG_DRIVER_BSD -DHOSTAPD
-CFLAGS+= -DCONFIG_DRIVER_RADIUS_ACL
+CFLA
svn commit: r234712 - in head: lib/libc/sys usr.sbin/jail
Author: jamie
Date: Thu Apr 26 17:36:05 2012
New Revision: 234712
URL: http://svn.freebsd.org/changeset/base/234712
Log:
A new jail(8) with a configuration file, ultimately to replace the work
currently done by /etc/rc.d/jail.
MFC after:3 months
Added:
head/usr.sbin/jail/command.c
- copied unchanged from r232242, projects/jailconf/usr.sbin/jail/command.c
head/usr.sbin/jail/config.c
- copied unchanged from r232242, projects/jailconf/usr.sbin/jail/config.c
head/usr.sbin/jail/jail.conf.5
- copied unchanged from r232242,
projects/jailconf/usr.sbin/jail/jail.conf.5
head/usr.sbin/jail/jaillex.l
- copied unchanged from r232242, projects/jailconf/usr.sbin/jail/jaillex.l
head/usr.sbin/jail/jailp.h
- copied unchanged from r232242, projects/jailconf/usr.sbin/jail/jailp.h
head/usr.sbin/jail/jailparse.y
- copied unchanged from r232242,
projects/jailconf/usr.sbin/jail/jailparse.y
head/usr.sbin/jail/state.c
- copied unchanged from r232242, projects/jailconf/usr.sbin/jail/state.c
Modified:
head/lib/libc/sys/jail.2
head/usr.sbin/jail/Makefile
head/usr.sbin/jail/jail.8
head/usr.sbin/jail/jail.c
Directory Properties:
head/lib/libc/ (props changed)
head/usr.sbin/jail/ (props changed)
Modified: head/lib/libc/sys/jail.2
==
--- head/lib/libc/sys/jail.2Thu Apr 26 17:35:11 2012(r234711)
+++ head/lib/libc/sys/jail.2Thu Apr 26 17:36:05 2012(r234712)
@@ -247,44 +247,6 @@ They return \-1 on failure, and set
to indicate the error.
.Pp
.Rv -std jail_attach jail_remove
-.Sh PRISON?
-Once a process has been put in a prison, it and its descendants cannot escape
-the prison.
-.Pp
-Inside the prison, the concept of
-.Dq superuser
-is very diluted.
-In general,
-it can be assumed that nothing can be mangled from inside a prison which
-does not exist entirely inside that prison.
-For instance the directory
-tree below
-.Dq Li path
-can be manipulated all the ways a root can normally do it, including
-.Dq Li "rm -rf /*"
-but new device special nodes cannot be created because they reference
-shared resources (the device drivers in the kernel).
-The effective
-.Dq securelevel
-for a process is the greater of the global
-.Dq securelevel
-or, if present, the per-jail
-.Dq securelevel .
-.Pp
-All IP activity will be forced to happen to/from the IP number specified,
-which should be an alias on one of the network interfaces.
-All connections to/from the loopback address
-.Pf ( Li 127.0.0.1
-for IPv4,
-.Li ::1
-for IPv6) will be changed to be to/from the primary address
-of the jail for the given address family.
-.Pp
-It is possible to identify a process as jailed by examining
-.Dq Li /proc//status :
-it will show a field near the end of the line, either as
-a single hyphen for a process at large, or the name currently
-set for the prison for jailed processes.
.Sh ERRORS
The
.Fn jail
@@ -415,7 +377,7 @@ and
.Fn jail_attach
call
.Xr chroot 2
-internally, so it can fail for all the same reasons.
+internally, so they can fail for all the same reasons.
Please consult the
.Xr chroot 2
manual page for details.
Modified: head/usr.sbin/jail/Makefile
==
--- head/usr.sbin/jail/Makefile Thu Apr 26 17:35:11 2012(r234711)
+++ head/usr.sbin/jail/Makefile Thu Apr 26 17:36:05 2012(r234712)
@@ -3,9 +3,14 @@
.include
PROG= jail
-MAN= jail.8
-DPADD= ${LIBJAIL} ${LIBUTIL}
-LDADD= -ljail -lutil
+MAN= jail.8 jail.conf.5
+SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h
+
+DPADD= ${LIBJAIL} ${LIBKVM} ${LIBUTIL} ${LIBL}
+LDADD= -ljail -lkvm -lutil -ll
+
+YFLAGS+=-v
+CFLAGS+=-I. -I${.CURDIR}
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
@@ -14,4 +19,6 @@ CFLAGS+= -DINET6
CFLAGS+= -DINET
.endif
+CLEANFILES= y.output
+
.include
Copied: head/usr.sbin/jail/command.c (from r232242,
projects/jailconf/usr.sbin/jail/command.c)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/jail/command.cThu Apr 26 17:36:05 2012
(r234712, copy of r232242, projects/jailconf/usr.sbin/jail/command.c)
@@ -0,0 +1,857 @@
+/*-
+ * Copyright (c) 2011 James Gritton
+ * 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
svn commit: r234714 - head/lib/libc/gen
Author: eadler Date: Thu Apr 26 19:21:58 2012 New Revision: 234714 URL: http://svn.freebsd.org/changeset/base/234714 Log: Use the .Bx macro instead of BSD Submitted by: ru Approved by: ru MFC after:3 days X-MFC-With: r234700 Modified: head/lib/libc/gen/err.3 Modified: head/lib/libc/gen/err.3 == --- head/lib/libc/gen/err.3 Thu Apr 26 18:16:44 2012(r234713) +++ head/lib/libc/gen/err.3 Thu Apr 26 19:21:58 2012(r234714) @@ -217,7 +217,9 @@ The .Fn err and .Fn warn -families of functions are BSD extensions. +families of functions are +.Bx +extensions. As such they should not be used in truly portable code. Use .Fn strerror ___ 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: r234715 - head/lib/libc/net
Author: tuexen
Date: Thu Apr 26 19:31:16 2012
New Revision: 234715
URL: http://svn.freebsd.org/changeset/base/234715
Log:
Export symbols for sctp_sendv() and sctp_recvv().
MFC after: 1 week
Modified:
head/lib/libc/net/Symbol.map
Modified: head/lib/libc/net/Symbol.map
==
--- head/lib/libc/net/Symbol.mapThu Apr 26 19:21:58 2012
(r234714)
+++ head/lib/libc/net/Symbol.mapThu Apr 26 19:31:16 2012
(r234715)
@@ -135,8 +135,10 @@ FBSD_1.0 {
sctp_sendmsg;
sctp_sendmsgx;
sctp_send;
+ sctp_sendv;
sctp_sendx;
sctp_recvmsg;
+ sctp_recvv;
setipv4sourcefilter;
getipv4sourcefilter;
getsourcefilter;
___
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: r234715 - head/lib/libc/net
On Thu, Apr 26, 2012 at 07:31:16PM +, Michael Tuexen wrote:
> Author: tuexen
> Date: Thu Apr 26 19:31:16 2012
> New Revision: 234715
> URL: http://svn.freebsd.org/changeset/base/234715
>
> Log:
> Export symbols for sctp_sendv() and sctp_recvv().
>
> MFC after: 1 week
>
> Modified:
> head/lib/libc/net/Symbol.map
>
> Modified: head/lib/libc/net/Symbol.map
> ==
> --- head/lib/libc/net/Symbol.map Thu Apr 26 19:21:58 2012
> (r234714)
> +++ head/lib/libc/net/Symbol.map Thu Apr 26 19:31:16 2012
> (r234715)
> @@ -135,8 +135,10 @@ FBSD_1.0 {
> sctp_sendmsg;
> sctp_sendmsgx;
> sctp_send;
> + sctp_sendv;
> sctp_sendx;
> sctp_recvmsg;
> + sctp_recvv;
> setipv4sourcefilter;
> getipv4sourcefilter;
> getsourcefilter;
These are new symbols, they should go into the current (FBSD_1.3)
version.
pgp5XOzpnBLin.pgp
Description: PGP signature
Re: svn commit: r234715 - head/lib/libc/net
On Apr 26, 2012, at 9:33 PM, Konstantin Belousov wrote:
> On Thu, Apr 26, 2012 at 07:31:16PM +, Michael Tuexen wrote:
>> Author: tuexen
>> Date: Thu Apr 26 19:31:16 2012
>> New Revision: 234715
>> URL: http://svn.freebsd.org/changeset/base/234715
>>
>> Log:
>> Export symbols for sctp_sendv() and sctp_recvv().
>>
>> MFC after: 1 week
>>
>> Modified:
>> head/lib/libc/net/Symbol.map
>>
>> Modified: head/lib/libc/net/Symbol.map
>> ==
>> --- head/lib/libc/net/Symbol.map Thu Apr 26 19:21:58 2012
>> (r234714)
>> +++ head/lib/libc/net/Symbol.map Thu Apr 26 19:31:16 2012
>> (r234715)
>> @@ -135,8 +135,10 @@ FBSD_1.0 {
>> sctp_sendmsg;
>> sctp_sendmsgx;
>> sctp_send;
>> +sctp_sendv;
>> sctp_sendx;
>> sctp_recvmsg;
>> +sctp_recvv;
>> setipv4sourcefilter;
>> getipv4sourcefilter;
>> getsourcefilter;
> These are new symbols, they should go into the current (FBSD_1.3)
> version.
And where is that? Should I add something like
FBSD_1.3 {
sctp_recvv;
sctp_sendv;
}
Or in another file? Will it be possible to MFC that to stable/8 and stable/9?
I added the functions a while ago, but missed to add them to the Symbol.map.
Best regards
Michael
___
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: r234715 - head/lib/libc/net
On Thu, Apr 26, 2012 at 09:36:38PM +0200, Michael Tuexen wrote:
> On Apr 26, 2012, at 9:33 PM, Konstantin Belousov wrote:
>
> > On Thu, Apr 26, 2012 at 07:31:16PM +, Michael Tuexen wrote:
> >> Author: tuexen
> >> Date: Thu Apr 26 19:31:16 2012
> >> New Revision: 234715
> >> URL: http://svn.freebsd.org/changeset/base/234715
> >>
> >> Log:
> >> Export symbols for sctp_sendv() and sctp_recvv().
> >>
> >> MFC after: 1 week
> >>
> >> Modified:
> >> head/lib/libc/net/Symbol.map
> >>
> >> Modified: head/lib/libc/net/Symbol.map
> >> ==
> >> --- head/lib/libc/net/Symbol.map Thu Apr 26 19:21:58 2012
> >> (r234714)
> >> +++ head/lib/libc/net/Symbol.map Thu Apr 26 19:31:16 2012
> >> (r234715)
> >> @@ -135,8 +135,10 @@ FBSD_1.0 {
> >>sctp_sendmsg;
> >>sctp_sendmsgx;
> >>sctp_send;
> >> + sctp_sendv;
> >>sctp_sendx;
> >>sctp_recvmsg;
> >> + sctp_recvv;
> >>setipv4sourcefilter;
> >>getipv4sourcefilter;
> >>getsourcefilter;
> > These are new symbols, they should go into the current (FBSD_1.3)
> > version.
> And where is that? Should I add something like
> FBSD_1.3 {
> sctp_recvv;
> sctp_sendv;
> }
Right, add it between FBSD_1.0 and FBSDprivate_1.0.
>
> Or in another file? Will it be possible to MFC that to stable/8 and stable/9?
> I added the functions a while ago, but missed to add them to the Symbol.map.
Yes, it is possible to MFC this to both stable/8 and stable/9.
Straight merge should do it.
pgpUyiHUrIZuX.pgp
Description: PGP signature
svn commit: r234716 - head/lib/libc/net
Author: tuexen
Date: Thu Apr 26 19:56:06 2012
New Revision: 234716
URL: http://svn.freebsd.org/changeset/base/234716
Log:
Move sctp_sendv and sctp_recvv to FBSD_1.3 as suggested by
Konstantin Belousov.
MFC after: 1 week.
X-MFC with: r234715
Modified:
head/lib/libc/net/Symbol.map
Modified: head/lib/libc/net/Symbol.map
==
--- head/lib/libc/net/Symbol.mapThu Apr 26 19:31:16 2012
(r234715)
+++ head/lib/libc/net/Symbol.mapThu Apr 26 19:56:06 2012
(r234716)
@@ -135,16 +135,19 @@ FBSD_1.0 {
sctp_sendmsg;
sctp_sendmsgx;
sctp_send;
- sctp_sendv;
sctp_sendx;
sctp_recvmsg;
- sctp_recvv;
setipv4sourcefilter;
getipv4sourcefilter;
getsourcefilter;
setsourcefilter;
};
+FBSD_1.3 {
+ sctp_recvv;
+ sctp_sendv;
+};
+
FBSDprivate_1.0 {
_nsdispatch;
_nsyyerror; /* generated from nslexer.l */
___
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: r234715 - head/lib/libc/net
On Apr 26, 2012, at 9:39 PM, Konstantin Belousov wrote:
> On Thu, Apr 26, 2012 at 09:36:38PM +0200, Michael Tuexen wrote:
>> On Apr 26, 2012, at 9:33 PM, Konstantin Belousov wrote:
>>
>>> On Thu, Apr 26, 2012 at 07:31:16PM +, Michael Tuexen wrote:
Author: tuexen
Date: Thu Apr 26 19:31:16 2012
New Revision: 234715
URL: http://svn.freebsd.org/changeset/base/234715
Log:
Export symbols for sctp_sendv() and sctp_recvv().
MFC after: 1 week
Modified:
head/lib/libc/net/Symbol.map
Modified: head/lib/libc/net/Symbol.map
==
--- head/lib/libc/net/Symbol.map Thu Apr 26 19:21:58 2012
(r234714)
+++ head/lib/libc/net/Symbol.map Thu Apr 26 19:31:16 2012
(r234715)
@@ -135,8 +135,10 @@ FBSD_1.0 {
sctp_sendmsg;
sctp_sendmsgx;
sctp_send;
+ sctp_sendv;
sctp_sendx;
sctp_recvmsg;
+ sctp_recvv;
setipv4sourcefilter;
getipv4sourcefilter;
getsourcefilter;
>>> These are new symbols, they should go into the current (FBSD_1.3)
>>> version.
>> And where is that? Should I add something like
>> FBSD_1.3 {
>> sctp_recvv;
>> sctp_sendv;
>> }
> Right, add it between FBSD_1.0 and FBSDprivate_1.0.
>
>>
>> Or in another file? Will it be possible to MFC that to stable/8 and stable/9?
>> I added the functions a while ago, but missed to add them to the Symbol.map.
>
> Yes, it is possible to MFC this to both stable/8 and stable/9.
> Straight merge should do it.
Done in r234716. Thanks for the help.
Just to be sure: After an MFC to stable/9, the symbol will be usable in the
upcoming
9.1, right?
Best regards
Michael
___
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: r234723 - in head/sys: amd64/amd64 amd64/include i386/i386 i386/include pc98/pc98 sparc64/include sparc64/sparc64 x86/x86
Author: attilio
Date: Thu Apr 26 20:24:25 2012
New Revision: 234723
URL: http://svn.freebsd.org/changeset/base/234723
Log:
Clean up the intr* MD KPI from the SMP dependency, removing a cause of
discrepancy between modules and kernel, but deal with SMP differences
within the functions themselves.
As an added bonus this also helps in terms of code readability.
Requested by: gibbs
Reviewed by: jhb, marius
MFC after:1 week
Modified:
head/sys/amd64/amd64/machdep.c
head/sys/amd64/include/intr_machdep.h
head/sys/i386/i386/machdep.c
head/sys/i386/include/intr_machdep.h
head/sys/pc98/pc98/machdep.c
head/sys/sparc64/include/intr_machdep.h
head/sys/sparc64/sparc64/intr_machdep.c
head/sys/sparc64/sparc64/machdep.c
head/sys/x86/x86/intr_machdep.c
Modified: head/sys/amd64/amd64/machdep.c
==
--- head/sys/amd64/amd64/machdep.c Thu Apr 26 20:23:14 2012
(r234722)
+++ head/sys/amd64/amd64/machdep.c Thu Apr 26 20:24:25 2012
(r234723)
@@ -296,12 +296,10 @@ cpu_startup(dummy)
cpu_setregs();
-#ifdef SMP
/*
* Add BSP as an interrupt target.
*/
intr_add_cpu(0);
-#endif
}
/*
Modified: head/sys/amd64/include/intr_machdep.h
==
--- head/sys/amd64/include/intr_machdep.h Thu Apr 26 20:23:14 2012
(r234722)
+++ head/sys/amd64/include/intr_machdep.h Thu Apr 26 20:24:25 2012
(r234723)
@@ -140,15 +140,11 @@ int elcr_probe(void);
enum intr_trigger elcr_read_trigger(u_int irq);
void elcr_resume(void);
void elcr_write_trigger(u_int irq, enum intr_trigger trigger);
-#ifdef SMP
void intr_add_cpu(u_int cpu);
-#endif
intintr_add_handler(const char *name, int vector, driver_filter_t filter,
driver_intr_t handler, void *arg, enum intr_type
flags,
void **cookiep);
-#ifdef SMP
intintr_bind(u_int vector, u_char cpu);
-#endif
intintr_config_intr(int vector, enum intr_trigger trig,
enum intr_polarity pol);
intintr_describe(u_int vector, void *ih, const char *descr);
Modified: head/sys/i386/i386/machdep.c
==
--- head/sys/i386/i386/machdep.cThu Apr 26 20:23:14 2012
(r234722)
+++ head/sys/i386/i386/machdep.cThu Apr 26 20:24:25 2012
(r234723)
@@ -337,12 +337,10 @@ cpu_startup(dummy)
cpu_setregs();
#endif
-#ifdef SMP
/*
* Add BSP as an interrupt target.
*/
intr_add_cpu(0);
-#endif
}
/*
Modified: head/sys/i386/include/intr_machdep.h
==
--- head/sys/i386/include/intr_machdep.hThu Apr 26 20:23:14 2012
(r234722)
+++ head/sys/i386/include/intr_machdep.hThu Apr 26 20:24:25 2012
(r234723)
@@ -131,14 +131,10 @@ int elcr_probe(void);
enum intr_trigger elcr_read_trigger(u_int irq);
void elcr_resume(void);
void elcr_write_trigger(u_int irq, enum intr_trigger trigger);
-#ifdef SMP
void intr_add_cpu(u_int cpu);
-#endif
intintr_add_handler(const char *name, int vector, driver_filter_t filter,
driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep);
-#ifdef SMP
intintr_bind(u_int vector, u_char cpu);
-#endif
intintr_config_intr(int vector, enum intr_trigger trig,
enum intr_polarity pol);
intintr_describe(u_int vector, void *ih, const char *descr);
Modified: head/sys/pc98/pc98/machdep.c
==
--- head/sys/pc98/pc98/machdep.cThu Apr 26 20:23:14 2012
(r234722)
+++ head/sys/pc98/pc98/machdep.cThu Apr 26 20:24:25 2012
(r234723)
@@ -272,12 +272,10 @@ cpu_startup(dummy)
vm_pager_bufferinit();
cpu_setregs();
-#ifdef SMP
/*
* Add BSP as an interrupt target.
*/
intr_add_cpu(0);
-#endif
}
/*
Modified: head/sys/sparc64/include/intr_machdep.h
==
--- head/sys/sparc64/include/intr_machdep.h Thu Apr 26 20:23:14 2012
(r234722)
+++ head/sys/sparc64/include/intr_machdep.h Thu Apr 26 20:24:25 2012
(r234723)
@@ -91,9 +91,7 @@ struct intr_vector {
extern ih_func_t *intr_handlers[];
extern struct intr_vector intr_vectors[];
-#ifdef SMP
void intr_add_cpu(u_int cpu);
-#endif
intintr_bind(int vec, u_char cpu);
intintr_describe(int vec, void *ih, const char *descr);
void intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf,
Modified: head/sys/sparc64/sparc64/intr_machdep.c
==
--- head/sys/sparc64/sparc64/intr_machdep.c
Re: svn commit: r234711 - in head/usr.sbin/wpa: . hostapd
Thanks, i actually forgot to submit this.
On Thu, Apr 26, 2012 at 7:35 PM, Bernhard Schmidt wrote:
> Author: bschmidt
> Date: Thu Apr 26 17:35:11 2012
> New Revision: 234711
> URL: http://svn.freebsd.org/changeset/base/234711
>
> Log:
> fix EAP server support after the 0.7.3 import:
> - eap_xxx.c files have been renamed to eap_server_xxx.c
> - additional crypto files are required for some options
> - EAP_MD5 and EAP_GTC is now enabled by default to match vendor config
> - move each file on its own line to hopefully make further diffs easier
> to read
>
> EAP_SERVER is now enabled by default. Fiddling with HOSTAPD_CFLAGS in
> src.conf is no longer required to get a basic WPA-EAP/radius setup
> running.
>
> Tested by: Johann Hugo
> MFC after: 2 weeks
>
> Modified:
> head/usr.sbin/wpa/Makefile.inc
> head/usr.sbin/wpa/hostapd/Makefile
>
> Modified: head/usr.sbin/wpa/Makefile.inc
> ==
> --- head/usr.sbin/wpa/Makefile.inc Thu Apr 26 14:51:12 2012
> (r234710)
> +++ head/usr.sbin/wpa/Makefile.inc Thu Apr 26 17:35:11 2012
> (r234711)
> @@ -7,17 +7,23 @@ WPA_SUPPLICANT_DISTDIR?=${WPA_DISTDIR}/w
> HOSTAPD_DISTDIR?= ${WPA_DISTDIR}/hostapd
>
> .PATH.c:${.CURDIR}/.. \
> + ${WPA_DISTDIR}/src/ap \
> ${WPA_DISTDIR}/src/common \
> ${WPA_DISTDIR}/src/crypto \
> + ${WPA_DISTDIR}/src/eapol_auth \
> ${WPA_DISTDIR}/src/eap_common \
> + ${WPA_DISTDIR}/src/eap_server \
> ${WPA_DISTDIR}/src/eapol_supp \
> ${WPA_DISTDIR}/src/l2_packet \
> + ${WPA_DISTDIR}/src/radius \
> ${WPA_DISTDIR}/src/utils
>
> CFLAGS+=-I${.CURDIR}
> +CFLAGS+=-I${HOSTAPD_DISTDIR}
> CFLAGS+=-I${WPA_DISTDIR}/src
> CFLAGS+=-I${WPA_DISTDIR}/src/common
> CFLAGS+=-I${WPA_DISTDIR}/src/crypto
> +CFLAGS+=-I${WPA_DISTDIR}/src/drivers
> CFLAGS+=-I${WPA_DISTDIR}/src/l2_packet
> CFLAGS+=-I${WPA_DISTDIR}/src/utils
>
>
> Modified: head/usr.sbin/wpa/hostapd/Makefile
> ==
> --- head/usr.sbin/wpa/hostapd/Makefile Thu Apr 26 14:51:12 2012
> (r234710)
> +++ head/usr.sbin/wpa/hostapd/Makefile Thu Apr 26 17:35:11 2012
> (r234711)
> @@ -2,33 +2,59 @@
>
> .include "${.CURDIR}/../Makefile.inc"
>
> -.PATH.c:${HOSTAPD_DISTDIR} \
> - ${WPA_DISTDIR}/src/ap \
> - ${WPA_DISTDIR}/src/eap_server \
> - ${WPA_DISTDIR}/src/eap_common \
> - ${WPA_DISTDIR}/src/eapol_auth \
> - ${WPA_DISTDIR}/src/drivers \
> - ${WPA_DISTDIR}/src/radius \
> - ${WPA_DISTDIR}
> +.PATH.c:${WPA_DISTDIR}/src/drivers
>
> PROG= hostapd
> -SRCS= accounting.c aes-wrap.c ap_config.c \
> - ap_drv_ops.c ap_mlme.c authsrv.c \
> - chap.c common.c config_file.c ctrl_iface.c crypto_openssl.c \
> - ctrl_iface_ap.c drivers.c drv_callbacks.c dump_state.c \
> - eap_common.c eap_peap_common.c eap_register.c eap_server.c \
> - eap_server_gtc.c eap_server_identity.c eap_server_md5.c \
> - eap_server_methods.c eap_server_mschapv2.c eap_server_peap.c \
> - eap_server_tls.c eap_server_tls_common.c eap_server_ttls.c \
> - eapol_auth_dump.c eapol_auth_sm.c eloop.c hostapd.c ieee802_11_auth.c
> \
> - ieee802_11_common.c ieee802_11_ht.c ieee802_1x.c ip_addr.c \
> - md5.c main.c ms_funcs.c peerkey_auth.c pmksa_cache_auth.c \
> - preauth_auth.c radius.c radius_client.c sta_info.c \
> - sha1-pbkdf2.c sha1-tlsprf.c sha1-tprf.c sha1.c \
> - tkip_countermeasures.c utils.c \
> - vlan_init.c wpa_auth.c wpa_auth_glue.c wpa_auth_ie.c wpa_common.c \
> - wpa_debug.c wpabuf.c
> -SRCS+= l2_packet_freebsd.c driver_freebsd.c os_unix.c
> +SRCS= accounting.c \
> + aes-wrap.c \
> + ap_config.c \
> + ap_drv_ops.c \
> + ap_mlme.c \
> + authsrv.c \
> + chap.c \
> + common.c \
> + config_file.c \
> + crypto_openssl.c \
> + ctrl_iface.c \
> + ctrl_iface_ap.c \
> + drivers.c \
> + drv_callbacks.c \
> + eap_common.c \
> + eap_peap_common.c \
> + eap_register.c \
> + eapol_auth_dump.c \
> + eapol_auth_sm.c \
> + eap_server.c \
> + eap_server_methods.c \
> + eloop.c \
> + hostapd.c \
> + ieee802_11_auth.c \
> + ieee802_11_common.c \
> + ieee802_1x.c \
> + ip_addr.c \
> + main.c \
> + md5.c \
> + ms_funcs.c \
> + os_unix.c \
> + peerkey_auth.c \
> + pmksa_cache_auth.c \
> + preauth_auth.c \
> + radius.c \
> + radius_client.c \
> + sha1-pbkdf2.c \
> + sha1-tlsprf.c \
> + sha1.c \
> + sta_info.c \
> + tkip_countermeasures.c \
> + utils.c \
> + vlan_init.c \
> + wpa_auth.c \
> + wpa_auth_glue.c \
> + wpa_auth_ie.c \
> + wpa_common.c \
> + wpa_debug.c \
> + wpabuf.c
>
svn commit: r234724 - head
Author: imp
Date: Thu Apr 26 23:12:52 2012
New Revision: 234724
URL: http://svn.freebsd.org/changeset/base/234724
Log:
Fix ordering issue. 'make xdev' can fail with -jN because it tries to run the
xdev-install step while xdev-build is still running.
Submitted by: Ian Lepore
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu Apr 26 20:24:25 2012(r234723)
+++ head/Makefile.inc1 Thu Apr 26 23:12:52 2012(r234724)
@@ -1649,8 +1649,8 @@ _xi-mtree:
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
-p ${XDDESTDIR}/usr/include >/dev/null
-.ORDER: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
-xdev-install: _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
+.ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
_xi-links
+xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries
_xi-links
_xi-cross-tools:
@echo "_xi-cross-tools"
___
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: r234725 - head/sys/dev/ath
Author: adrian
Date: Thu Apr 26 23:57:24 2012
New Revision: 234725
URL: http://svn.freebsd.org/changeset/base/234725
Log:
Remove some of the redundant locking done in the TX completion path,
when checking whether BAR frames need to be checked.
Modified:
head/sys/dev/ath/if_ath_tx.c
Modified: head/sys/dev/ath/if_ath_tx.c
==
--- head/sys/dev/ath/if_ath_tx.cThu Apr 26 23:12:52 2012
(r234724)
+++ head/sys/dev/ath/if_ath_tx.cThu Apr 26 23:57:24 2012
(r234725)
@@ -3455,6 +3455,9 @@ ath_tx_comp_aggr_error(struct ath_softc
ATH_TXQ_INSERT_HEAD(tid, bf, bf_list);
}
+ /*
+* Schedule the TID to be re-tried.
+*/
ath_tx_tid_sched(sc, tid);
/*
@@ -3469,12 +3472,9 @@ ath_tx_comp_aggr_error(struct ath_softc
ath_tx_tid_bar_suspend(sc, tid);
}
- ATH_TXQ_UNLOCK(sc->sc_ac2q[tid->ac]);
-
/*
* Send BAR if required
*/
- ATH_TXQ_LOCK(sc->sc_ac2q[tid->ac]);
if (ath_tx_tid_bar_tx_ready(sc, tid))
ath_tx_tid_bar_tx(sc, tid);
ATH_TXQ_UNLOCK(sc->sc_ac2q[tid->ac]);
@@ -3742,24 +3742,28 @@ ath_tx_aggr_comp_aggr(struct ath_softc *
ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
}
- /* Prepend all frames to the beginning of the queue */
+ DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
+ "%s: txa_start now %d\n", __func__, tap->txa_start);
+
ATH_TXQ_LOCK(sc->sc_ac2q[atid->ac]);
+
+ /* Prepend all frames to the beginning of the queue */
while ((bf = TAILQ_LAST(&bf_q, ath_bufhead_s)) != NULL) {
TAILQ_REMOVE(&bf_q, bf, bf_list);
ATH_TXQ_INSERT_HEAD(atid, bf, bf_list);
}
- ath_tx_tid_sched(sc, atid);
- ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
- DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
- "%s: txa_start now %d\n", __func__, tap->txa_start);
+ /*
+* Reschedule to grab some further frames.
+*/
+ ath_tx_tid_sched(sc, atid);
/*
* Send BAR if required
*/
- ATH_TXQ_LOCK(sc->sc_ac2q[atid->ac]);
if (ath_tx_tid_bar_tx_ready(sc, atid))
ath_tx_tid_bar_tx(sc, atid);
+
ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
/* Do deferred completion */
___
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"
