svn commit: r240530 - head/usr.sbin/adduser
Author: issyl0 (doc committer) Date: Sat Sep 15 16:24:03 2012 New Revision: 240530 URL: http://svn.freebsd.org/changeset/base/240530 Log: Remove a reference to CVS and to freefall from a user-facing man page. PR: docs/171658 Reported by: Chris Petrik (c dot petrik dot sosa at gmail dot com) Approved by: gabor (mentor) MFC after:5 days Modified: head/usr.sbin/adduser/adduser.8 Modified: head/usr.sbin/adduser/adduser.8 == --- head/usr.sbin/adduser/adduser.8 Sat Sep 15 02:58:02 2012 (r240529) +++ head/usr.sbin/adduser/adduser.8 Sat Sep 15 16:24:03 2012 (r240530) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 16, 2008 +.Dd September 15, 2012 .Dt ADDUSER 8 .Os .Sh NAME @@ -129,9 +129,8 @@ they can safely run with a umask of 002 and create files in their home directory without worrying about others being able to change them. .Pp -For a shared area you create a separate UID/GID (like cvs or ncvs on freefall), -you place each person that should be able to access this area into that new -group. +For a shared area you create a separate UID/GID, you place each person +that should be able to access this area into that new group. .Pp This model of UID/GID administration allows far greater flexibility than lumping users into groups and having to muck with the umask when working in a shared ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240531 - head/contrib/llvm/lib/Target/X86
Author: dim
Date: Sat Sep 15 17:02:05 2012
New Revision: 240531
URL: http://svn.freebsd.org/changeset/base/240531
Log:
Pull in r163967 from upstream llvm trunk:
X86: Emitting x87 fsin/fcos for sinf/cosf is not safe without unsafe
fp math.
This should make clang emit calls to libm for sinf/cosf by default.
MFC after:1 week
Modified:
head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
Modified: head/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
==
--- head/contrib/llvm/lib/Target/X86/X86ISelLowering.cppSat Sep 15
16:24:03 2012(r240530)
+++ head/contrib/llvm/lib/Target/X86/X86ISelLowering.cppSat Sep 15
17:02:05 2012(r240531)
@@ -643,7 +643,9 @@ X86TargetLowering::X86TargetLowering(X86
setOperationAction(ISD::FCOPYSIGN, MVT::f32, Expand);
if (!TM.Options.UnsafeFPMath) {
+ setOperationAction(ISD::FSIN , MVT::f32 , Expand);
setOperationAction(ISD::FSIN , MVT::f64 , Expand);
+ setOperationAction(ISD::FCOS , MVT::f32 , Expand);
setOperationAction(ISD::FCOS , MVT::f64 , Expand);
}
addLegalFPImmediate(APFloat(+0.0)); // FLD0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240532 - head/sys/arm/arm
Author: alc Date: Sat Sep 15 17:32:19 2012 New Revision: 240532 URL: http://svn.freebsd.org/changeset/base/240532 Log: Eliminate an unused malloc type. Modified: head/sys/arm/arm/vm_machdep.c Modified: head/sys/arm/arm/vm_machdep.c == --- head/sys/arm/arm/vm_machdep.c Sat Sep 15 17:02:05 2012 (r240531) +++ head/sys/arm/arm/vm_machdep.c Sat Sep 15 17:32:19 2012 (r240532) @@ -537,8 +537,6 @@ extern uma_zone_t l2zone; struct mtx smallalloc_mtx; -static MALLOC_DEFINE(M_VMSMALLALLOC, "vm_small_alloc", "VM Small alloc data"); - vm_offset_t alloc_firstaddr; #ifdef ARM_HAVE_SUPERSECTIONS ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240533 - stable/9/sys/boot/common
Author: andreast
Date: Sat Sep 15 17:47:44 2012
New Revision: 240533
URL: http://svn.freebsd.org/changeset/base/240533
Log:
MFC: r240249
Fix loading of kernel modules at boot time for powerpc64.
Reported by: Mathias Breuninger
Modified:
stable/9/sys/boot/common/load_elf.c
Modified: stable/9/sys/boot/common/load_elf.c
==
--- stable/9/sys/boot/common/load_elf.c Sat Sep 15 17:32:19 2012
(r240532)
+++ stable/9/sys/boot/common/load_elf.c Sat Sep 15 17:47:44 2012
(r240533)
@@ -588,7 +588,7 @@ fake_modname(const char *name)
return fp;
}
-#if defined(__i386__) && __ELF_WORD_SIZE == 64
+#if (defined(__i386__) || defined(__powerpc__)) && __ELF_WORD_SIZE == 64
struct mod_metadata64 {
int md_version; /* structure version MDTV_* */
int md_type;/* type of entry MDT_* */
@@ -601,7 +601,7 @@ int
__elfN(parse_modmetadata)(struct preloaded_file *fp, elf_file_t ef)
{
struct mod_metadata md;
-#if defined(__i386__) && __ELF_WORD_SIZE == 64
+#if (defined(__i386__) || defined(__powerpc__)) && __ELF_WORD_SIZE == 64
struct mod_metadata64 md64;
#endif
struct mod_depend *mdepend;
@@ -626,7 +626,7 @@ __elfN(parse_modmetadata)(struct preload
v += ef->off;
else if (error != 0)
return (error);
-#if defined(__i386__) && __ELF_WORD_SIZE == 64
+#if (defined(__i386__) || defined(__powerpc__)) && __ELF_WORD_SIZE == 64
COPYOUT(v, &md64, sizeof(md64));
error = __elfN(reloc_ptr)(fp, ef, v, &md64, sizeof(md64));
if (error == EOPNOTSUPP) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240534 - svnadmin/tools/svnssh
Author: bz
Date: Sat Sep 15 18:00:34 2012
New Revision: 240534
URL: http://svn.freebsd.org/changeset/base/240534
Log:
Use SVN access files rather than CVS. At least doc is no longer
exported to CVS so new committers did not gain access.
Use a defined length for username (not ideal but better than 32).
Consistently use username and not pw->pw_name. Close the password
database files to ensure we cannot access them any more after copy.
Factor out reading access files for karma into a function; no longer
allow open to fail. Put #ifdef checks around all three file reads,
not just the extra two.
Move karma variable initializations to just before needed.
Modified:
svnadmin/tools/svnssh/svnssh.c
Modified: svnadmin/tools/svnssh/svnssh.c
==
--- svnadmin/tools/svnssh/svnssh.c Sat Sep 15 17:47:44 2012
(r240533)
+++ svnadmin/tools/svnssh/svnssh.c Sat Sep 15 18:00:34 2012
(r240534)
@@ -31,9 +31,8 @@
#define SVNROOT"/s/svn"
#define BASEACCESS SVNROOT "/base/conf/access"
-/* Access cvs access files over nfs for now */
-#define DOCACCESS "/home/dcvs/CVSROOT/access"
-#define PORTSACCESS"/home/pcvs/CVSROOT/access"
+#define DOCACCESS SVNROOT "/doc/conf/access"
+#define PORTSACCESSSVNROOT "/ports/conf/access"
#define NOCOMMIT "/etc/nocommit"
@@ -44,7 +43,7 @@ static const char *env[] = {
NULL
};
-static char username[32];
+static char username[_SC_LOGIN_NAME_MAX + 1];
static char linebuf[1024];
static void
@@ -61,6 +60,7 @@ msg(const char *fmt, ...)
static void
usage(void)
{
+
msg("Only the \"svnserve -t\" command is available.");
exit(1);
}
@@ -80,7 +80,7 @@ shell(char *argv[], int interactive)
}
static int
-karmacheck(FILE *fp, char *name)
+karmacheck(FILE *fp, const char *name)
{
char buf[1024];
char *p, *s;
@@ -107,6 +107,26 @@ karmacheck(FILE *fp, char *name)
return karma;
}
+static int
+read_access(const char *accessf, const char *name)
+{
+ FILE *fp;
+ int karma;
+
+ karma = 0;
+ /* Must not fail. */
+ fp = fopen(accessf, "r");
+ if (fp == NULL) {
+ msg("Cannot open %s", accessf);
+ exit(1);
+ } else {
+ karma = karmacheck(fp, name);
+ fclose(fp);
+ }
+
+ return (karma);
+}
+
int
main(int argc, char *argv[])
{
@@ -119,12 +139,9 @@ main(int argc, char *argv[])
gid_t repogid;
gid_t mygroups[NGROUPS_MAX];
int ngroups;
- int karma;
- int shellkarma;
+ int karma, shellkarma;
umask(002);
- karma = 0;
- shellkarma = 0;
openlog("svnssh", LOG_PID | LOG_NDELAY, LOG_AUTH);
pw = getpwuid(getuid());
if (pw == NULL) {
@@ -136,9 +153,11 @@ main(int argc, char *argv[])
exit(1);
}
- /* save in a static buffer */
+ /* Save in a static buffer. */
strlcpy(username, pw->pw_name, sizeof(username));
+ endpwent();
+ shellkarma = 0;
ngroups = getgroups(NGROUPS_MAX, mygroups);
if (ngroups > 0) {
gr = getgrnam("shell");
@@ -191,27 +210,15 @@ main(int argc, char *argv[])
exit(1);
}
- fp = fopen(BASEACCESS, "r");
- if (fp == NULL) {
- msg("Cannot open %s", BASEACCESS);
- exit(1);
- } else {
- karma += karmacheck(fp, pw->pw_name);
- fclose(fp);
- }
+ karma = 0;
+#ifdef BASEACCESS
+ karma += read_access(BASEACCESS, username);
+#endif
#ifdef DOCACCESS
- /* Allow for failures due to NFS */
- if ((fp = fopen(DOCACCESS, "r")) != NULL) {
- karma += karmacheck(fp, pw->pw_name);
- fclose(fp);
- }
+ karma += read_access(DOCACCESS, username);
#endif
#ifdef PORTSACCESS
- /* Allow for failures due to NFS */
- if ((fp = fopen(PORTSACCESS, "r")) != NULL) {
- karma += karmacheck(fp, pw->pw_name);
- fclose(fp);
- }
+ karma += read_access(PORTSACCESS, username);
#endif
if (karma > 0) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240535 - svnadmin/hooks/scripts
Author: bz Date: Sat Sep 15 18:26:09 2012 New Revision: 240535 URL: http://svn.freebsd.org/changeset/base/240535 Log: As an intermediate step to unify checkacl, check for a base (src) specific version as we do for doc and ports currently. Add an extra argument, which is currently ignored for base, stating that it is a request for a commit to base. Modified: svnadmin/hooks/scripts/env.sh Modified: svnadmin/hooks/scripts/env.sh == --- svnadmin/hooks/scripts/env.sh Sat Sep 15 18:00:34 2012 (r240534) +++ svnadmin/hooks/scripts/env.sh Sat Sep 15 18:26:09 2012 (r240535) @@ -4,6 +4,8 @@ PATH=/s/svn/base/hooks/scripts:/usr/bin: export PATH cd /s/svn/base umask 002 -if [ -x /usr/local/bin/checkacl ]; then - eval `/usr/local/bin/checkacl` +if [ -x /usr/local/bin/checkacl-base ]; then + eval `/usr/local/bin/checkacl-base base` +elif [ -x /usr/local/bin/checkacl ]; then + eval `/usr/local/bin/checkacl base` fi ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240536 - svnadmin/tools/checkacl
Author: bz Date: Sat Sep 15 18:34:12 2012 New Revision: 240536 URL: http://svn.freebsd.org/changeset/base/240536 Log: Install checkacl as checkacl-base, like done for doc and ports. This is the more specific in env.sh as of r240535. Modified: svnadmin/tools/checkacl/Makefile Modified: svnadmin/tools/checkacl/Makefile == --- svnadmin/tools/checkacl/MakefileSat Sep 15 18:26:09 2012 (r240535) +++ svnadmin/tools/checkacl/MakefileSat Sep 15 18:34:12 2012 (r240536) @@ -1,6 +1,7 @@ # $FreeBSD$ -PROG= checkacl +PROG= checkacl-base +SRCS= checkacl.c NO_MAN=too bad NO_SHARED=yes DESTDIR=/usr/local/bin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240537 - in stable/9/usr.bin: mkcsmapper mkesdb
Author: dim
Date: Sat Sep 15 18:53:00 2012
New Revision: 240537
URL: http://svn.freebsd.org/changeset/base/240537
Log:
MFC r238197:
Fix spelling
PR: bin/167480
Submitted by: zeising
Approved by:cperciva
MFC r240365:
Ensure mkcsmapper and mkesdb compile with clang, if WITH_ICONV is
defined.
PR: bin/167481
Submitted by: zeising
Modified:
stable/9/usr.bin/mkcsmapper/lex.l
stable/9/usr.bin/mkesdb/lex.l
Directory Properties:
stable/9/usr.bin/mkcsmapper/ (props changed)
stable/9/usr.bin/mkesdb/ (props changed)
Modified: stable/9/usr.bin/mkcsmapper/lex.l
==
--- stable/9/usr.bin/mkcsmapper/lex.l Sat Sep 15 18:34:12 2012
(r240536)
+++ stable/9/usr.bin/mkcsmapper/lex.l Sat Sep 15 18:53:00 2012
(r240537)
@@ -43,6 +43,7 @@
int line_number = 1;
%}
+%optionnoinput
%optionnounput
%x COMMENT
@@ -57,7 +58,7 @@ int line_number = 1;
[\n] { line_number++; }
. { }
<> {
- yyerror("unexpected file end (unterminate comment)\n");
+ yyerror("unexpected file end (unterminated comment)\n");
exit(1);
}
Modified: stable/9/usr.bin/mkesdb/lex.l
==
--- stable/9/usr.bin/mkesdb/lex.l Sat Sep 15 18:34:12 2012
(r240536)
+++ stable/9/usr.bin/mkesdb/lex.l Sat Sep 15 18:53:00 2012
(r240537)
@@ -45,6 +45,7 @@
int line_number = 1;
%}
+%optionnoinput
%optionnounput
%x COMMENT
@@ -59,7 +60,7 @@ int line_number = 1;
[\n] { line_number++; }
. { }
<> {
- yyerror("unexpected file end (unterminate comment)\n");
+ yyerror("unexpected file end (unterminated comment)\n");
exit(1);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240538 - svnadmin/tools/checkacl
Author: bz
Date: Sat Sep 15 19:17:19 2012
New Revision: 240538
URL: http://svn.freebsd.org/changeset/base/240538
Log:
Start synchronizing checkacl.c between various SVN repositories.
Stop using CVS access files and use the SVN versions.
Use a defined length for user named (not ideal but better than 32).
Rather than using a variable per repo and karma, use two bitfields.
Factor out repeated tasks, as checking an access file and adding
the string for another foreign commit bit.
Use #ifdef checks for all files, not just docs and ports. base is
not special.
Defer variable initialization to when needed.
Accept a mandatory argument, the repo name, to allow code sharing
between the repositories of all shared access files.
Consistently use the 'username' and not pw_name after copy; close
the password database to avoid further access.
Inspired by: ports version from beat
Modified:
svnadmin/tools/checkacl/checkacl.c
Modified: svnadmin/tools/checkacl/checkacl.c
==
--- svnadmin/tools/checkacl/checkacl.c Sat Sep 15 18:53:00 2012
(r240537)
+++ svnadmin/tools/checkacl/checkacl.c Sat Sep 15 19:17:19 2012
(r240538)
@@ -4,6 +4,8 @@
* FreeBSD Subversion tree ACL check helper. The program looks in
* relevant access files to find out if the committer may commit.
*
+ * !!! Please keep in sync between various SVN repositories. !!!
+ *
* From: Id: cvssh.c,v 1.38 2008/05/31 02:54:58 peter Exp
* $FreeBSD$
*/
@@ -24,13 +26,16 @@
#include
#include
-#define ACCESS "/s/svn/base/conf/access"
-#define DOCACCESS "/home/dcvs/CVSROOT/access"
-#define PORTSACCESS"/home/pcvs/CVSROOT/access"
-
+#defineBASE0x01
+#defineDOC 0x02
+#definePORTS 0x04
+
+#defineSVNROOT "/s/svn"
+#defineBASEACCESS SVNROOT "/base/conf/access"
+#defineDOCACCESS SVNROOT "/doc/conf/access"
+#definePORTSACCESS SVNROOT "/ports/conf/access"
-static char username[32];
-static char committag[256];
+static char username[_SC_LOGIN_NAME_MAX + 1];
static void
msg(const char *fmt, ...)
@@ -43,12 +48,12 @@ msg(const char *fmt, ...)
va_end(ap);
}
-static int
-karmacheck(FILE *fp, char *name)
+static u_int
+karmacheck(FILE *fp, const char *name, u_int k)
{
char buf[1024];
char *p, *s;
- int karma;
+ u_int karma;
karma = 0;
while ((p = fgets(buf, sizeof(buf) - 1, fp)) != NULL) {
@@ -58,11 +63,11 @@ karmacheck(FILE *fp, char *name)
if (*s == '#' || *s == '/' || *s == ';')
break; /* comment */
if (strcmp(s, "*") == 0) { /* all */
- karma++;
+ karma |= k;
break;
}
if (strcmp(s, name) == 0) {
- karma++;
+ karma |= k;
break;
}
break; /* ignore further tokens on line */
@@ -71,34 +76,49 @@ karmacheck(FILE *fp, char *name)
return karma;
}
+static u_int
+read_access(const char *accessf, const u_int repo, u_int k,
+const char *name)
+{
+ FILE *fp;
+ u_int karma;
+
+ karma = 0;
+ fp = fopen(accessf, "r");
+ if (fp == NULL && (repo & k) == k) {
+ msg("Cannot open %s", accessf);
+ exit(1);
+ } else if (fp != NULL) {
+ karma |= karmacheck(fp, name, k);
+ fclose(fp);
+ }
+
+ return (karma);
+}
+
+static void
+catcommittag(char *committag, const char **comma, const u_int karma,
+const u_int k, const char *s)
+{
+
+ if ((karma & k) == 0)
+ return;
+
+ strcat(committag, *comma);
+ strcat(committag, s);
+ *comma = ",";
+}
+
int
main(int argc, char *argv[])
{
struct passwd *pw;
struct stat st;
- FILE *fp;
- int i;
gid_t repogid;
gid_t mygroups[NGROUPS_MAX];
- int ngroups;
- int writeable;
- int karma;
-#ifdef PORTSACCESS
- int portskarma;
-#endif
-#ifdef DOCACCESS
- int dockarma;
-#endif
- const char *comma;
+ int i, ngroups, writeable;
+ u_int karma, repo;
-#ifdef PORTSACCESS
- portskarma = 0;
-#endif
-#ifdef DOCACCESS
- dockarma = 0;
-#endif
- karma = 0;
- writeable = 0;
pw = getpwuid(getuid());
if (pw == NULL) {
msg("no user for uid %d", getuid());
@@ -109,11 +129,12 @@ main(int argc, char *argv[])
exit(1);
}
- /* save in a static buffer */
+ /* Save in a static buffer. */
strlcpy(username, pw->pw_name, sizeof(username));
+ endpwent(
svn commit: r240539 - in head/sys: dev/drm2 dev/drm2/i915 fs/devfs mips/mips
Author: ed
Date: Sat Sep 15 19:28:54 2012
New Revision: 240539
URL: http://svn.freebsd.org/changeset/base/240539
Log:
Prefer __containerof() above member2struct().
The first does proper checking of the argument types, while the latter
does not.
Modified:
head/sys/dev/drm2/drm_gem.c
head/sys/dev/drm2/i915/i915_drv.h
head/sys/fs/devfs/devfs_int.h
head/sys/mips/mips/pmap.c
Modified: head/sys/dev/drm2/drm_gem.c
==
--- head/sys/dev/drm2/drm_gem.c Sat Sep 15 19:17:19 2012(r240538)
+++ head/sys/dev/drm2/drm_gem.c Sat Sep 15 19:28:54 2012(r240539)
@@ -396,7 +396,7 @@ drm_gem_object_from_offset(struct drm_de
(uintmax_t)offset);
return (NULL);
}
- obj = member2struct(drm_gem_object, map_list, map_list);
+ obj = __containerof(map_list, struct drm_gem_object, map_list);
return (obj);
}
Modified: head/sys/dev/drm2/i915/i915_drv.h
==
--- head/sys/dev/drm2/i915/i915_drv.h Sat Sep 15 19:17:19 2012
(r240538)
+++ head/sys/dev/drm2/i915/i915_drv.h Sat Sep 15 19:28:54 2012
(r240539)
@@ -889,7 +889,7 @@ struct drm_i915_gem_object {
int pending_flip;
};
-#defineto_intel_bo(x) member2struct(drm_i915_gem_object, base, (x))
+#defineto_intel_bo(x) __containerof(x, struct drm_i915_gem_object,
base)
/**
* Request queue structure.
Modified: head/sys/fs/devfs/devfs_int.h
==
--- head/sys/fs/devfs/devfs_int.h Sat Sep 15 19:17:19 2012
(r240538)
+++ head/sys/fs/devfs/devfs_int.h Sat Sep 15 19:28:54 2012
(r240539)
@@ -69,7 +69,7 @@ struct cdev_priv {
LIST_HEAD(, cdev_privdata) cdp_fdpriv;
};
-#definecdev2priv(c)member2struct(cdev_priv, cdp_c, c)
+#definecdev2priv(c)__containerof(c, struct cdev_priv, cdp_c)
struct cdev*devfs_alloc(int);
intdevfs_dev_exists(const char *);
Modified: head/sys/mips/mips/pmap.c
==
--- head/sys/mips/mips/pmap.c Sat Sep 15 19:17:19 2012(r240538)
+++ head/sys/mips/mips/pmap.c Sat Sep 15 19:28:54 2012(r240539)
@@ -1629,7 +1629,7 @@ pmap_pvh_free(struct md_page *pvh, pmap_
pv = pmap_pvh_remove(pvh, pmap, va);
KASSERT(pv != NULL, ("pmap_pvh_free: pv not found, pa %lx va %lx",
-(u_long)VM_PAGE_TO_PHYS(member2struct(vm_page, md, pvh)),
+(u_long)VM_PAGE_TO_PHYS(__containerof(pvh, struct vm_page, md)),
(u_long)va));
free_pv_entry(pmap, pv);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240540 - head/share/misc
Author: ebrandi (doc committer) Date: Sat Sep 15 20:09:08 2012 New Revision: 240540 URL: http://svn.freebsd.org/changeset/base/240540 Log: Add myself, and show gabor@ as my mentor. Approved by:gabor (mentor) Modified: head/share/misc/committers-doc.dot Modified: head/share/misc/committers-doc.dot == --- head/share/misc/committers-doc.dot Sat Sep 15 19:28:54 2012 (r240539) +++ head/share/misc/committers-doc.dot Sat Sep 15 20:09:08 2012 (r240540) @@ -58,6 +58,7 @@ brueffer [label="Christian Brueffer\nbru chinsan [label="Chinsan Huang\nchin...@freebsd.org\n2006/09/20"] danger [label="Daniel Gerzo\ndan...@freebsd.org\n2006/08/20"] delphij [label="Xin Li\ndelp...@freebsd.org\n2004/09/14"] +ebrandi [label="Edson Brandi\nebra...@freebsd.org\n2012/09/13"] gabor [label="Gabor Kovesdan\nga...@freebsd.org\n2007/02/02"] ganbold [label="Ganbold Tsagaankhuu\nganb...@freebsd.org\n2008/02/26"] gavin [label="Gavin Atkinson\nga...@freebsd.org\n2011/07/18"] @@ -110,6 +111,7 @@ gabor -> pgj gabor -> manolis gabor -> taras gabor -> issyl0 +gabor -> ebrandi gjb -> wblock ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r240527 - head/bin/df
On 15-09-2012 01:47, Eitan Adler wrote: > Author: eadler > Date: Fri Sep 14 23:47:23 2012 > New Revision: 240527 > URL: http://svn.freebsd.org/changeset/base/240527 > > Log: > Free memory before exiting in order to > help tools understand that we're not leaking it. > > PR: bin/171634 > Submitted by: Erik Cederstrand > Approved by:cperciva > MFC after: 3 days > > Modified: > head/bin/df/df.c > > Modified: head/bin/df/df.c > == > --- head/bin/df/df.c Fri Sep 14 22:53:47 2012(r240526) > +++ head/bin/df/df.c Fri Sep 14 23:47:23 2012(r240527) > @@ -290,6 +290,7 @@ main(int argc, char *argv[]) > prtstat(&mntbuf[i], &maxwidths); > if (cflag) > prtstat(&totalbuf, &maxwidths); > + free(mntbuf); > return (rv); > } Freeing memory right before exiting is a waste of time. The tool shouldn't complain about it. signature.asc Description: OpenPGP digital signature
Re: svn commit: r240527 - head/bin/df
On 15/09/2012 21:57, Tijl Coosemans wrote: Freeing memory right before exiting is a waste of time. The tool shouldn't complain about it. "/Stop wasting time and just exit already/." - http://blogs.msdn.com/b/oldnewthing/archive/2012/01/05/10253268.aspx -- Bruce Cran ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240541 - in head: bin/sh usr.bin/printf
Author: jilles
Date: Sat Sep 15 21:56:30 2012
New Revision: 240541
URL: http://svn.freebsd.org/changeset/base/240541
Log:
sh: Prefer internal nextopt() to libc getopt().
This reduces code duplication and code size.
/usr/bin/printf is not affected.
Side effect: different error messages when certain builtins are passed
invalid options.
Modified:
head/bin/sh/cd.c
head/bin/sh/eval.c
head/bin/sh/histedit.c
head/bin/sh/jobs.c
head/bin/sh/var.c
head/usr.bin/printf/printf.c
Modified: head/bin/sh/cd.c
==
--- head/bin/sh/cd.cSat Sep 15 20:09:08 2012(r240540)
+++ head/bin/sh/cd.cSat Sep 15 21:56:30 2012(r240541)
@@ -79,7 +79,7 @@ static char *prevdir; /* previous worki
static char *cdcomppath;
int
-cdcmd(int argc, char **argv)
+cdcmd(int argc __unused, char **argv __unused)
{
const char *dest;
const char *path;
@@ -89,9 +89,8 @@ cdcmd(int argc, char **argv)
int rc;
int errno1 = ENOENT;
- optreset = 1; optind = 1; opterr = 0; /* initialize getopt */
phys = Pflag;
- while ((ch = getopt(argc, argv, "eLP")) != -1) {
+ while ((ch = nextopt("eLP")) != '\0') {
switch (ch) {
case 'e':
getcwderr = 1;
@@ -102,18 +101,13 @@ cdcmd(int argc, char **argv)
case 'P':
phys = 1;
break;
- default:
- error("unknown option: -%c", optopt);
- break;
}
}
- argc -= optind;
- argv += optind;
- if (argc > 1)
+ if (*argptr != NULL && argptr[1] != NULL)
error("too many arguments");
- if ((dest = *argv) == NULL && (dest = bltinlookup("HOME", 1)) == NULL)
+ if ((dest = *argptr) == NULL && (dest = bltinlookup("HOME", 1)) == NULL)
error("HOME not set");
if (*dest == '\0')
dest = ".";
@@ -330,14 +324,13 @@ updatepwd(char *dir)
}
int
-pwdcmd(int argc, char **argv)
+pwdcmd(int argc __unused, char **argv __unused)
{
char *p;
int ch, phys;
- optreset = 1; optind = 1; opterr = 0; /* initialize getopt */
phys = Pflag;
- while ((ch = getopt(argc, argv, "LP")) != -1) {
+ while ((ch = nextopt("LP")) != '\0') {
switch (ch) {
case 'L':
phys = 0;
@@ -345,15 +338,10 @@ pwdcmd(int argc, char **argv)
case 'P':
phys = 1;
break;
- default:
- error("unknown option: -%c", optopt);
- break;
}
}
- argc -= optind;
- argv += optind;
- if (argc != 0)
+ if (*argptr != NULL)
error("too many arguments");
if (!phys && getpwd()) {
Modified: head/bin/sh/eval.c
==
--- head/bin/sh/eval.c Sat Sep 15 20:09:08 2012(r240540)
+++ head/bin/sh/eval.c Sat Sep 15 21:56:30 2012(r240541)
@@ -1223,7 +1223,7 @@ breakcmd(int argc, char **argv)
* The `command' command.
*/
int
-commandcmd(int argc, char **argv)
+commandcmd(int argc __unused, char **argv __unused)
{
const char *path;
int ch;
@@ -1231,9 +1231,7 @@ commandcmd(int argc, char **argv)
path = bltinlookup("PATH", 1);
- optind = optreset = 1;
- opterr = 0;
- while ((ch = getopt(argc, argv, "pvV")) != -1) {
+ while ((ch = nextopt("pvV")) != '\0') {
switch (ch) {
case 'p':
path = _PATH_STDPATH;
@@ -1244,20 +1242,15 @@ commandcmd(int argc, char **argv)
case 'V':
cmd = TYPECMD_BIGV;
break;
- case '?':
- default:
- error("unknown option: -%c", optopt);
}
}
- argc -= optind;
- argv += optind;
if (cmd != -1) {
- if (argc != 1)
+ if (*argptr == NULL || argptr[1] != NULL)
error("wrong number of arguments");
- return typecmd_impl(2, argv - 1, cmd, path);
+ return typecmd_impl(2, argptr - 1, cmd, path);
}
- if (argc != 0)
+ if (*argptr != NULL)
error("commandcmd bad call");
/*
Modified: head/bin/sh/histedit.c
==
--- head/bin/sh/histedit.c Sat Sep 15 20:09:08 2012(r240540)
+++ head/bin/sh/histedit.c Sat Sep 15 21:56:30 2012(r240541)
@@ -182,7 +182,7 @@ setterm(const char *term)
}
int
-histcmd(int argc, char **argv)
+histcmd(int argc, char **argv __unused)
{
in
Re: svn commit: r240484 - head/sys/dev/fdt
On Fri, 14 Sep 2012 18:41:13 +0200 Grzegorz Bernacki wrote: > On 09/14/12 16:16, Aleksandr Rybalko wrote: > > On Fri, 14 Sep 2012 09:33:35 + (UTC) > > Grzegorz Bernacki wrote: > > > >> Author: gber > >> Date: Fri Sep 14 09:33:35 2012 > >> New Revision: 240484 > >> URL: http://svn.freebsd.org/changeset/base/240484 > >> > >> Log: > >>Set busaddr and bussize to 0 when fdt_get_range() fails. > > > > Why bussize is 0? > > I though that setting it to 0 makes sense, since we do not use > this variable in this function and setting it to some value could be > confused. I could skip setting it, but I also thought it could cause > confusion :). If you think that setting it to other value or remove > it will be better please let me know and I will change it. > > thanks > grzesiek Yeah, indeed, false alarm. Sorry for noise. But it will be very nice to hear developers opinion about ePAPR1.1 row (about "range" property): "If the property is not present in a bus node, it is assumed that no mapping exists between children of the node and the parent address space." Assuming since in most cases root node have no "ranges" property, but his child "SOC" have that property with defaults (0x0 x 0x). So nodes which have property "ranges" or not, must be processed same way. Right? WBW -- Aleksandr Rybalko ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r240527 - head/bin/df
On 15 September 2012 17:20, Bruce Cran wrote: > On 15/09/2012 21:57, Tijl Coosemans wrote: >> >> Freeing memory right before exiting is a waste of time. The tool shouldn't >> complain about it. Perhaps, but tools do. This has already been brought up on cfe-dev. > "/Stop wasting time and just exit already/." - > http://blogs.msdn.com/b/oldnewthing/archive/2012/01/05/10253268.aspx I read this blog post when it came out. :) -- Eitan Adler Source & Ports committer X11, Bugbusting teams ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240542 - in stable/9: include/rpc sys/rpc
Author: pfg
Date: Sun Sep 16 00:32:25 2012
New Revision: 240542
URL: http://svn.freebsd.org/changeset/base/240542
Log:
MFC r240060, r240062:
Rename __rpc_xdr with XDR. This fixes at least one C++ application and
matches what upstream (Solaris) has done on their xdr.h header.
PR: 137443
Modified:
stable/9/include/rpc/xdr.h
stable/9/sys/rpc/rpc_com.h
stable/9/sys/rpc/xdr.h
Modified: stable/9/include/rpc/xdr.h
==
--- stable/9/include/rpc/xdr.h Sat Sep 15 21:56:30 2012(r240541)
+++ stable/9/include/rpc/xdr.h Sun Sep 16 00:32:25 2012(r240542)
@@ -97,26 +97,26 @@ enum xdr_op {
* an operations vector for the particular implementation (e.g. see xdr_mem.c),
* and two private fields for the use of the particular implementation.
*/
-typedef struct __rpc_xdr {
+typedef struct XDR {
enum xdr_op x_op; /* operation; fast additional param */
const struct xdr_ops {
/* get a long from underlying stream */
- bool_t (*x_getlong)(struct __rpc_xdr *, long *);
+ bool_t (*x_getlong)(struct XDR *, long *);
/* put a long to " */
- bool_t (*x_putlong)(struct __rpc_xdr *, const long *);
+ bool_t (*x_putlong)(struct XDR *, const long *);
/* get some bytes from " */
- bool_t (*x_getbytes)(struct __rpc_xdr *, char *, u_int);
+ bool_t (*x_getbytes)(struct XDR *, char *, u_int);
/* put some bytes to " */
- bool_t (*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
+ bool_t (*x_putbytes)(struct XDR *, const char *, u_int);
/* returns bytes off from beginning */
- u_int (*x_getpostn)(struct __rpc_xdr *);
+ u_int (*x_getpostn)(struct XDR *);
/* lets you reposition the stream */
- bool_t (*x_setpostn)(struct __rpc_xdr *, u_int);
+ bool_t (*x_setpostn)(struct XDR *, u_int);
/* buf quick ptr to buffered data */
- int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
+ int32_t *(*x_inline)(struct XDR *, u_int);
/* free privates of this xdr_stream */
- void(*x_destroy)(struct __rpc_xdr *);
- bool_t (*x_control)(struct __rpc_xdr *, int, void *);
+ void(*x_destroy)(struct XDR *);
+ bool_t (*x_control)(struct XDR *, int, void *);
} *x_ops;
char * x_public; /* users' data */
void * x_private; /* pointer to private data */
Modified: stable/9/sys/rpc/rpc_com.h
==
--- stable/9/sys/rpc/rpc_com.h Sat Sep 15 21:56:30 2012(r240541)
+++ stable/9/sys/rpc/rpc_com.h Sun Sep 16 00:32:25 2012(r240542)
@@ -114,8 +114,8 @@ extern int __rpc_sockisbound(struct sock
extern int bindresvport(struct socket *so, struct sockaddr *sa);
struct xucred;
-struct __rpc_xdr;
-bool_t xdr_authunix_parms(struct __rpc_xdr *xdrs, uint32_t *time, struct
xucred *cred);
+struct XDR;
+bool_t xdr_authunix_parms(struct XDR *xdrs, uint32_t *time, struct xucred
*cred);
#endif
__END_DECLS
Modified: stable/9/sys/rpc/xdr.h
==
--- stable/9/sys/rpc/xdr.h Sat Sep 15 21:56:30 2012(r240541)
+++ stable/9/sys/rpc/xdr.h Sun Sep 16 00:32:25 2012(r240542)
@@ -97,26 +97,26 @@ enum xdr_op {
* an operations vector for the particular implementation (e.g. see xdr_mem.c),
* and two private fields for the use of the particular implementation.
*/
-typedef struct __rpc_xdr {
+typedef struct XDR {
enum xdr_op x_op; /* operation; fast additional param */
const struct xdr_ops {
/* get a long from underlying stream */
- bool_t (*x_getlong)(struct __rpc_xdr *, long *);
+ bool_t (*x_getlong)(struct XDR *, long *);
/* put a long to " */
- bool_t (*x_putlong)(struct __rpc_xdr *, const long *);
+ bool_t (*x_putlong)(struct XDR *, const long *);
/* get some bytes from " */
- bool_t (*x_getbytes)(struct __rpc_xdr *, char *, u_int);
+ bool_t (*x_getbytes)(struct XDR *, char *, u_int);
/* put some bytes to " */
- bool_t (*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
+ bool_t (*x_putbytes)(struct XDR *, const char *, u_int);
/* returns bytes off from beginning */
- u_int (*x_getpostn)(struct __rpc_xdr *);
+ u_int (*x_getpostn)(struct XDR *);
/* lets you reposition the stream */
- bool_t (*x_setpostn)(struct __rpc_xdr *,
svn commit: r240543 - in stable/8: include/rpc sys/rpc
Author: pfg
Date: Sun Sep 16 00:34:04 2012
New Revision: 240543
URL: http://svn.freebsd.org/changeset/base/240543
Log:
MFC r240060, r240062:
Rename __rpc_xdr with XDR. This fixes at least one C++ application and
matches what upstream (Solaris) has done on their xdr.h header.
PR: 137443
Modified:
stable/8/include/rpc/xdr.h
stable/8/sys/rpc/rpc_com.h
stable/8/sys/rpc/xdr.h
Directory Properties:
stable/8/include/rpc/ (props changed)
stable/8/sys/rpc/ (props changed)
Modified: stable/8/include/rpc/xdr.h
==
--- stable/8/include/rpc/xdr.h Sun Sep 16 00:32:25 2012(r240542)
+++ stable/8/include/rpc/xdr.h Sun Sep 16 00:34:04 2012(r240543)
@@ -97,26 +97,26 @@ enum xdr_op {
* an operations vector for the particular implementation (e.g. see xdr_mem.c),
* and two private fields for the use of the particular implementation.
*/
-typedef struct __rpc_xdr {
+typedef struct XDR {
enum xdr_op x_op; /* operation; fast additional param */
const struct xdr_ops {
/* get a long from underlying stream */
- bool_t (*x_getlong)(struct __rpc_xdr *, long *);
+ bool_t (*x_getlong)(struct XDR *, long *);
/* put a long to " */
- bool_t (*x_putlong)(struct __rpc_xdr *, const long *);
+ bool_t (*x_putlong)(struct XDR *, const long *);
/* get some bytes from " */
- bool_t (*x_getbytes)(struct __rpc_xdr *, char *, u_int);
+ bool_t (*x_getbytes)(struct XDR *, char *, u_int);
/* put some bytes to " */
- bool_t (*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
+ bool_t (*x_putbytes)(struct XDR *, const char *, u_int);
/* returns bytes off from beginning */
- u_int (*x_getpostn)(struct __rpc_xdr *);
+ u_int (*x_getpostn)(struct XDR *);
/* lets you reposition the stream */
- bool_t (*x_setpostn)(struct __rpc_xdr *, u_int);
+ bool_t (*x_setpostn)(struct XDR *, u_int);
/* buf quick ptr to buffered data */
- int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
+ int32_t *(*x_inline)(struct XDR *, u_int);
/* free privates of this xdr_stream */
- void(*x_destroy)(struct __rpc_xdr *);
- bool_t (*x_control)(struct __rpc_xdr *, int, void *);
+ void(*x_destroy)(struct XDR *);
+ bool_t (*x_control)(struct XDR *, int, void *);
} *x_ops;
char * x_public; /* users' data */
void * x_private; /* pointer to private data */
Modified: stable/8/sys/rpc/rpc_com.h
==
--- stable/8/sys/rpc/rpc_com.h Sun Sep 16 00:32:25 2012(r240542)
+++ stable/8/sys/rpc/rpc_com.h Sun Sep 16 00:34:04 2012(r240543)
@@ -114,8 +114,8 @@ extern int __rpc_sockisbound(struct sock
extern int bindresvport(struct socket *so, struct sockaddr *sa);
struct xucred;
-struct __rpc_xdr;
-bool_t xdr_authunix_parms(struct __rpc_xdr *xdrs, uint32_t *time, struct
xucred *cred);
+struct XDR;
+bool_t xdr_authunix_parms(struct XDR *xdrs, uint32_t *time, struct xucred
*cred);
#endif
__END_DECLS
Modified: stable/8/sys/rpc/xdr.h
==
--- stable/8/sys/rpc/xdr.h Sun Sep 16 00:32:25 2012(r240542)
+++ stable/8/sys/rpc/xdr.h Sun Sep 16 00:34:04 2012(r240543)
@@ -97,26 +97,26 @@ enum xdr_op {
* an operations vector for the particular implementation (e.g. see xdr_mem.c),
* and two private fields for the use of the particular implementation.
*/
-typedef struct __rpc_xdr {
+typedef struct XDR {
enum xdr_op x_op; /* operation; fast additional param */
const struct xdr_ops {
/* get a long from underlying stream */
- bool_t (*x_getlong)(struct __rpc_xdr *, long *);
+ bool_t (*x_getlong)(struct XDR *, long *);
/* put a long to " */
- bool_t (*x_putlong)(struct __rpc_xdr *, const long *);
+ bool_t (*x_putlong)(struct XDR *, const long *);
/* get some bytes from " */
- bool_t (*x_getbytes)(struct __rpc_xdr *, char *, u_int);
+ bool_t (*x_getbytes)(struct XDR *, char *, u_int);
/* put some bytes to " */
- bool_t (*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
+ bool_t (*x_putbytes)(struct XDR *, const char *, u_int);
/* returns bytes off from beginning */
- u_int (*x_getpostn)(struct __rpc_xdr *);
+ u_int (*x_getpostn)(struct XDR *);
svn commit: r240544 - in stable/8/share/examples: . cvsup
Author: eadler Date: Sun Sep 16 00:35:09 2012 New Revision: 240544 URL: http://svn.freebsd.org/changeset/base/240544 Log: MFC r240252,r240253: Remove documentation and www cvsup files as they are no longer useful with the switch to subversion. Specifically document that an incomplete ports tree is not supported. Remove useless comment about sendmail. Approved by: cperciva (implicit) Deleted: stable/8/share/examples/cvsup/doc-supfile stable/8/share/examples/cvsup/www-supfile Modified: stable/8/share/examples/Makefile stable/8/share/examples/cvsup/cvs-supfile stable/8/share/examples/cvsup/refuse stable/8/share/examples/cvsup/refuse.README stable/8/share/examples/cvsup/stable-supfile Directory Properties: stable/8/share/examples/ (props changed) stable/8/share/examples/cvsup/ (props changed) stable/8/share/man/man5/ (props changed) Modified: stable/8/share/examples/Makefile == --- stable/8/share/examples/MakefileSun Sep 16 00:34:04 2012 (r240543) +++ stable/8/share/examples/MakefileSun Sep 16 00:35:09 2012 (r240544) @@ -52,14 +52,12 @@ XFILES= BSD_daemon/FreeBSD.pfa \ csh/dot.cshrc \ cvsup/README \ cvsup/cvs-supfile \ - cvsup/doc-supfile \ cvsup/gnats-supfile \ cvsup/ports-supfile \ cvsup/refuse \ cvsup/refuse.README \ cvsup/stable-supfile \ cvsup/standard-supfile \ - cvsup/www-supfile \ diskless/ME \ diskless/README.BOOTP \ diskless/README.TEMPLATING \ Modified: stable/8/share/examples/cvsup/cvs-supfile == --- stable/8/share/examples/cvsup/cvs-supfile Sun Sep 16 00:34:04 2012 (r240543) +++ stable/8/share/examples/cvsup/cvs-supfile Sun Sep 16 00:35:09 2012 (r240544) @@ -169,19 +169,6 @@ ports-all #ports-x11-toolkits #ports-x11-wm -## Documentation -# -# The easiest way to get the doc tree is to use the "doc-all" -# mega-collection. It includes all of the individual "doc-*" -# collections, -doc-all - -## Website -# -# This collection retrieves the www tree of the FreeBSD -# repository -www - ## Projects # # This collection retrieves the projects tree of the FreeBSD @@ -200,4 +187,3 @@ cvsroot-all #cvsroot-common #cvsroot-src #cvsroot-ports -#cvsroot-doc Modified: stable/8/share/examples/cvsup/refuse == --- stable/8/share/examples/cvsup/refuseSun Sep 16 00:34:04 2012 (r240543) +++ stable/8/share/examples/cvsup/refuseSun Sep 16 00:35:09 2012 (r240544) @@ -1,23 +1,3 @@ -doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/id_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ro_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_* ports/arabic ports/chinese ports/french Modified: stable/8/share/examples/cvsup/refuse.README == --- stable/8/share/examples/cvsup/refuse.README Sun Sep 16 00:34:04 2012 (r240543) +++ stable/8/share/examples/cvsup/refuse.README Sun Sep 16 00:35:09 2012 (r240544) @@ -16,33 +16,9 @@ CVSup's base directory to "/var/db". Th directory; i.e., it is "/var/db/sup". If you have changed your base directory, your sup directory is /path/to/base/sup. -This file used to contain /usr/src/etc/sendmail/freebsd.mc in case -you modified that file. However, this was removed as it can break -buildworld. Modify /etc/mail/`hostname`.mc instead. - If you are an English speaker and don't wish to receive the -foreign-language documentation or ports, use the following patterns: +non-English ports, use the following patterns: -doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/id_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ro_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_* ports/arabic ports/chinese ports/french @@ -57,6 +33,9 @@ foreign-language documentation or ports, ports/ukrainian ports/vietnamese +Note that this is *not* a supported configuration and may result +in ports builds breaking. + Use refuse files with care. Some parts of the src distribution depend on files in completely different parts. Modified: stable/8/share/examples/cvsup/stable-supfile == --- stable/8/share/examples/cvsup/stable-supfileSun Sep 16 00:34:04 2012(r240543) +++ stable/8/share/examples/cvsup/stable-supfileSun Sep 16 00:35:09 2012(r240544) @@ -43,14 +43,13 @@ # # DANGER! WARNING! LOOK OUT! VORSICHT! # -# If you add any of the ports
svn commit: r240545 - in stable/9/share/examples: . cvsup etc
Author: eadler Date: Sun Sep 16 00:35:09 2012 New Revision: 240545 URL: http://svn.freebsd.org/changeset/base/240545 Log: MFC r240252,r240253: Remove documentation and www cvsup files as they are no longer useful with the switch to subversion. Specifically document that an incomplete ports tree is not supported. Remove useless comment about sendmail. Approved by: cperciva (implicit) Deleted: stable/9/share/examples/cvsup/doc-supfile stable/9/share/examples/cvsup/www-supfile Modified: stable/9/share/examples/Makefile stable/9/share/examples/cvsup/cvs-supfile stable/9/share/examples/cvsup/refuse stable/9/share/examples/cvsup/refuse.README stable/9/share/examples/cvsup/stable-supfile stable/9/share/examples/etc/make.conf Directory Properties: stable/9/share/examples/ (props changed) stable/9/share/examples/cvsup/ (props changed) stable/9/share/examples/etc/ (props changed) stable/9/share/man/man5/ (props changed) Modified: stable/9/share/examples/Makefile == --- stable/9/share/examples/MakefileSun Sep 16 00:35:09 2012 (r240544) +++ stable/9/share/examples/MakefileSun Sep 16 00:35:09 2012 (r240545) @@ -53,14 +53,12 @@ XFILES= BSD_daemon/FreeBSD.pfa \ csh/dot.cshrc \ cvsup/README \ cvsup/cvs-supfile \ - cvsup/doc-supfile \ cvsup/gnats-supfile \ cvsup/ports-supfile \ cvsup/refuse \ cvsup/refuse.README \ cvsup/stable-supfile \ cvsup/standard-supfile \ - cvsup/www-supfile \ diskless/ME \ diskless/README.BOOTP \ diskless/README.TEMPLATING \ Modified: stable/9/share/examples/cvsup/cvs-supfile == --- stable/9/share/examples/cvsup/cvs-supfile Sun Sep 16 00:35:09 2012 (r240544) +++ stable/9/share/examples/cvsup/cvs-supfile Sun Sep 16 00:35:09 2012 (r240545) @@ -169,19 +169,6 @@ ports-all #ports-x11-toolkits #ports-x11-wm -## Documentation -# -# The easiest way to get the doc tree is to use the "doc-all" -# mega-collection. It includes all of the individual "doc-*" -# collections, -doc-all - -## Website -# -# This collection retrieves the www tree of the FreeBSD -# repository -www - ## Projects # # This collection retrieves the projects tree of the FreeBSD @@ -200,4 +187,3 @@ cvsroot-all #cvsroot-common #cvsroot-src #cvsroot-ports -#cvsroot-doc Modified: stable/9/share/examples/cvsup/refuse == --- stable/9/share/examples/cvsup/refuseSun Sep 16 00:35:09 2012 (r240544) +++ stable/9/share/examples/cvsup/refuseSun Sep 16 00:35:09 2012 (r240545) @@ -1,23 +1,3 @@ -doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/id_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ro_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_* ports/arabic ports/chinese ports/french Modified: stable/9/share/examples/cvsup/refuse.README == --- stable/9/share/examples/cvsup/refuse.README Sun Sep 16 00:35:09 2012 (r240544) +++ stable/9/share/examples/cvsup/refuse.README Sun Sep 16 00:35:09 2012 (r240545) @@ -16,33 +16,9 @@ CVSup's base directory to "/var/db". Th directory; i.e., it is "/var/db/sup". If you have changed your base directory, your sup directory is /path/to/base/sup. -This file used to contain /usr/src/etc/sendmail/freebsd.mc in case -you modified that file. However, this was removed as it can break -buildworld. Modify /etc/mail/`hostname`.mc instead. - If you are an English speaker and don't wish to receive the -foreign-language documentation or ports, use the following patterns: +non-English ports, use the following patterns: -doc/bn_* -doc/da_* -doc/de_* -doc/el_* -doc/es_* -doc/fr_* -doc/hu_* -doc/id_* -doc/it_* -doc/ja_* -doc/mn_* -doc/nl_* -doc/no_* -doc/pl_* -doc/pt_* -doc/ro_* -doc/ru_* -doc/sr_* -doc/tr_* -doc/zh_* ports/arabic ports/chinese ports/french @@ -57,6 +33,9 @@ foreign-language documentation or ports, ports/ukrainian ports/vietnamese +Note that this is *not* a supported configuration and may result +in ports builds breaking. + Use refuse files with care. Some parts of the src distribution depend on files in completely different parts. Modified: stable/9/share/examples/cvsup/stable-supfile == --- stable/9/share/examples/cvsup/stable-supfileSun Sep 16 00:35:09 2012(r240544) +++ stable/9/share/examples/cvsup/stable-supfileSun Sep 16 00:35:09 2012(r240545) @@ -43,14
svn commit: r240546 - head/usr.bin/procstat
Author: kib Date: Sun Sep 16 05:52:54 2012 New Revision: 240546 URL: http://svn.freebsd.org/changeset/base/240546 Log: Handle AT_TIMEKEEP in procstat(1) -x [1]. Remove the AT_COUNT switch case, since AT_COUNT is not an aux vector, it is the counter of total number of defined vectors. PR: bin/171662 [1] MFC after:1 week Modified: head/usr.bin/procstat/procstat_auxv.c Modified: head/usr.bin/procstat/procstat_auxv.c == --- head/usr.bin/procstat/procstat_auxv.c Sun Sep 16 00:35:09 2012 (r240545) +++ head/usr.bin/procstat/procstat_auxv.c Sun Sep 16 05:52:54 2012 (r240546) @@ -231,9 +231,11 @@ procstat_auxv(struct kinfo_proc *kipp) else PRINT(AT_STACKPROT, %s, "EXECUTABLE"); break; - case AT_COUNT: - PRINT(AT_COUNT, %ld, (long)auxv[i].a_un.a_val); +#ifdef AT_TIMEKEEP + case AT_TIMEKEEP: + PRINT(AT_TIMEKEEP, %p, auxv[i].a_un.a_ptr); break; +#endif default: PRINT_UNKNOWN(auxv[i].a_type, auxv[i].a_un.a_val); break; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240547 - head/sys/conf
Author: rpaulo
Date: Sun Sep 16 06:01:34 2012
New Revision: 240547
URL: http://svn.freebsd.org/changeset/base/240547
Log:
Add Perforce support.
Modified:
head/sys/conf/newvers.sh
Modified: head/sys/conf/newvers.sh
==
--- head/sys/conf/newvers.shSun Sep 16 05:52:54 2012(r240546)
+++ head/sys/conf/newvers.shSun Sep 16 06:01:34 2012(r240547)
@@ -88,9 +88,11 @@ v=`cat version` u=${USER:-root} d=`pwd`
i=`${MAKE:-make} -V KERN_IDENT`
for dir in /bin /usr/bin /usr/local/bin; do
- if [ -x "${dir}/svnversion" ] ; then
+ if [ -x "${dir}/svnversion" ] && [ -z ${svnversion} ] ; then
svnversion=${dir}/svnversion
- break
+ fi
+ if [ -x "${dir}/p4" ] && [ -z ${p4_cmd} ] ; then
+ p4_cmd=${dir}/p4
fi
done
if [ -d "${SYSDIR}/../.git" ] ; then
@@ -132,10 +134,27 @@ if [ -n "$git_cmd" ] ; then
fi
fi
+if [ -n "$p4_cmd" ] ; then
+ p4version=`cd ${SYSDIR} && $p4_cmd changes -m1 "./...#have" 2>&1 | \
+ awk '{ print $2 }'`
+ case "$p4version" in
+ [0-9]*)
+ p4version=" ${p4version}"
+ p4opened=`$p4_cmd opened 2>&1`
+ case "$p4opened" in
+ File*) ;;
+ *) p4version="${p4version}+pending" ;;
+ esac
+ ;;
+ *) unset p4version ;;
+ esac
+fi
+
+
cat << EOF > vers.c
$COPYRIGHT
-#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}: ${t}"
-#define VERSTR "${VERSION} #${v}${svn}${git}: ${t}\\n${u}@${h}:${d}\\n"
+#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"
+#define VERSTR "${VERSION} #${v}${svn}${git}${p4version}: ${t}\\n
${u}@${h}:${d}\\n"
#define RELSTR "${RELEASE}"
char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240548 - in head: share/misc usr.bin/calendar/calendars
Author: peterj Date: Sun Sep 16 06:44:58 2012 New Revision: 240548 URL: http://svn.freebsd.org/changeset/base/240548 Log: - Add myself as a new src committer. - Sort jhb's mentees - Add grog's (ex-)mentor Approved by: jhb (co-mentor), grog (co-mentor) Modified: head/share/misc/committers-src.dot head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/share/misc/committers-src.dot == --- head/share/misc/committers-src.dot Sun Sep 16 06:01:34 2012 (r240547) +++ head/share/misc/committers-src.dot Sun Sep 16 06:44:58 2012 (r240548) @@ -215,6 +215,7 @@ obrien [label="David E. O'Brien\nobrien@ olli [label="Oliver Fromme\no...@freebsd.org\n2008/02/14"] peadar [label="Peter Edwards\npea...@freebsd.org\n2004/03/08"] peter [label="Peter Wemm\npe...@freebsd.org\n/??/??"] +peterj [label="Peter Jeremy\npet...@freebsd.org\n2012/09/14"] pfg [label="Pedro Giffuni\n...@freebsd.org\n2011/12/01"] philip [label="Philip Paeps\nphi...@freebsd.org\n2004/01/21"] phk [label="Poul-Henning Kamp\n...@freebsd.org\n1994/02/21"] @@ -396,6 +397,7 @@ gnn -> davide grog -> edwin grog -> le +grog -> peterj imp -> akiyama imp -> ambrisko @@ -439,9 +441,11 @@ jhb -> arr jhb -> avg jhb -> jeff jhb -> kbyanc -jhb -> rnoland +jhb -> peterj jhb -> pfg +jhb -> rnoland +jkh -> grog jkh -> imp jkh -> jlemon jkh -> joerg Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdSun Sep 16 06:01:34 2012(r240547) +++ head/usr.bin/calendar/calendars/calendar.freebsdSun Sep 16 06:44:58 2012(r240548) @@ -119,6 +119,7 @@ 04/03 Tong Liu born in Beijing, People's Republic of China, 1981 04/03 Gabor Pali born in Kunhegyes, Hungary, 1982 04/05 Stacey Son born in Burley, Idaho, United States, 1967 +04/06 Peter Jeremy born in Sydney, New South Wales, Australia, 1961 04/07 Edward Tomasz Napierala born in Wolsztyn, Poland, 1981 04/08 Jordan K. Hubbard born in Honolulu, Hawaii, United States, 1963 04/09 Ceri Davies born in Haverfordwest, Pembrokeshire, United Kingdom, 1976 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
