Date: Sun, 11 Oct 2015 08:26:49 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289134 - in user/ngie/more-tests2: . contrib/dma contrib/dma/debian lib/libarchive/tests lib/libc/sys libexec/dma libexec/dma/dmagent sbin/geom/class/nop sbin/mdconfig share/man/man4 s... Message-ID: <201510110826.t9B8QnaW044339@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Oct 11 08:26:48 2015 New Revision: 289134 URL: https://svnweb.freebsd.org/changeset/base/289134 Log: Revert r289133; retry the merge Added: user/ngie/more-tests2/contrib/dma/BSDmakefile - copied unchanged from r289132, user/ngie/more-tests2/contrib/dma/BSDmakefile user/ngie/more-tests2/contrib/dma/debian/ - copied from r289132, user/ngie/more-tests2/contrib/dma/debian/ user/ngie/more-tests2/lib/libarchive/tests/ - copied from r289132, user/ngie/more-tests2/lib/libarchive/tests/ user/ngie/more-tests2/usr.bin/cpio/tests/ - copied from r289132, user/ngie/more-tests2/usr.bin/cpio/tests/ user/ngie/more-tests2/usr.bin/tar/tests/ - copied from r289132, user/ngie/more-tests2/usr.bin/tar/tests/ Modified: user/ngie/more-tests2/Makefile.inc1 user/ngie/more-tests2/contrib/dma/LICENSE user/ngie/more-tests2/contrib/dma/README.markdown user/ngie/more-tests2/contrib/dma/TODO user/ngie/more-tests2/contrib/dma/VERSION user/ngie/more-tests2/contrib/dma/aliases_parse.y user/ngie/more-tests2/contrib/dma/aliases_scan.l user/ngie/more-tests2/contrib/dma/conf.c user/ngie/more-tests2/contrib/dma/dma-mbox-create.c user/ngie/more-tests2/contrib/dma/dma.8 user/ngie/more-tests2/contrib/dma/dma.c user/ngie/more-tests2/contrib/dma/dma.h user/ngie/more-tests2/contrib/dma/dns.c user/ngie/more-tests2/contrib/dma/get-version.sh user/ngie/more-tests2/contrib/dma/local.c user/ngie/more-tests2/contrib/dma/mail.c user/ngie/more-tests2/contrib/dma/net.c user/ngie/more-tests2/contrib/dma/spool.c user/ngie/more-tests2/contrib/dma/util.c user/ngie/more-tests2/lib/libc/sys/shmctl.2 user/ngie/more-tests2/libexec/dma/Makefile.inc user/ngie/more-tests2/libexec/dma/dmagent/Makefile user/ngie/more-tests2/sbin/geom/class/nop/gnop.8 user/ngie/more-tests2/sbin/mdconfig/mdconfig.8 user/ngie/more-tests2/sbin/mdconfig/mdconfig.c user/ngie/more-tests2/share/man/man4/vtnet.4 user/ngie/more-tests2/share/mk/Makefile user/ngie/more-tests2/share/mk/bsd.confs.mk user/ngie/more-tests2/share/mk/bsd.own.mk user/ngie/more-tests2/sys/dev/cxgbe/iw_cxgbe/cm.c user/ngie/more-tests2/sys/dev/drm2/i915/i915_gem.c user/ngie/more-tests2/sys/dev/iicbus/icee.c user/ngie/more-tests2/sys/dev/iicbus/iiconf.h user/ngie/more-tests2/sys/dev/wpi/if_wpi.c user/ngie/more-tests2/sys/dev/wpi/if_wpireg.h user/ngie/more-tests2/sys/dev/wpi/if_wpivar.h user/ngie/more-tests2/sys/geom/nop/g_nop.c user/ngie/more-tests2/sys/geom/nop/g_nop.h user/ngie/more-tests2/sys/kern/kern_module.c user/ngie/more-tests2/sys/kern/sysv_shm.c user/ngie/more-tests2/sys/mips/conf/AP135.hints user/ngie/more-tests2/sys/mips/conf/TP-MR3020 user/ngie/more-tests2/sys/mips/conf/TP-MR3020.hints user/ngie/more-tests2/usr.sbin/ppp/Makefile Directory Properties: user/ngie/more-tests2/ (props changed) user/ngie/more-tests2/contrib/dma/ (props changed) user/ngie/more-tests2/lib/libc/ (props changed) user/ngie/more-tests2/sbin/ (props changed) user/ngie/more-tests2/share/ (props changed) user/ngie/more-tests2/share/man/man4/ (props changed) user/ngie/more-tests2/sys/ (props changed) Modified: user/ngie/more-tests2/Makefile.inc1 ============================================================================== --- user/ngie/more-tests2/Makefile.inc1 Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/Makefile.inc1 Sun Oct 11 08:26:48 2015 (r289134) @@ -1003,9 +1003,7 @@ distrib-dirs: .MAKE distribution: .MAKE cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET} - ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \ - ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ - METALOG=${METALOG} installconfig + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 installconfig # # buildkernel and installkernel Copied: user/ngie/more-tests2/contrib/dma/BSDmakefile (from r289132, user/ngie/more-tests2/contrib/dma/BSDmakefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/ngie/more-tests2/contrib/dma/BSDmakefile Sun Oct 11 08:26:48 2015 (r289134, copy of r289132, user/ngie/more-tests2/contrib/dma/BSDmakefile) @@ -0,0 +1,28 @@ +# $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $ +# + +version!= sh get-version.sh + +CFLAGS+= -I${.CURDIR} +CFLAGS+= -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME +CFLAGS+= -DLIBEXEC_PATH='"${LIBEXEC}"' -DDMA_VERSION='"${version}"' +CFLAGS+= -DCONF_PATH='"${CONFDIR}"' + +DPADD= ${LIBSSL} ${LIBCRYPTO} +LDADD= -lssl -lcrypto + +PROG= dma +SRCS= aliases_parse.y aliases_scan.l base64.c conf.c crypto.c +SRCS+= dma.c dns.c local.c mail.c net.c spool.c util.c +MAN= dma.8 + +PREFIX?= /usr/local +LIBEXEC?= ${PREFIX}/libexec +CONFDIR?= ${PREFIX}/etc/dma + +BINOWN= root +BINGRP= mail +BINMODE=2555 +WARNS?= 6 + +.include <bsd.prog.mk> Modified: user/ngie/more-tests2/contrib/dma/LICENSE ============================================================================== --- user/ngie/more-tests2/contrib/dma/LICENSE Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/LICENSE Sun Oct 11 08:26:48 2015 (r289134) @@ -1,5 +1,5 @@ -Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. Copyright (c) 2008 The DragonFly Project. +Copyright (c) 2008-2011, Simon Schubert <2@0x2c.org>. All rights reserved. This code is derived from software contributed to The DragonFly Project @@ -37,7 +37,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADV SUCH DAMAGE. -Copyright (c) 1995-2001 Kungliga Tekniska Högskolan +Copyright (c) 1995-2001 Kungliga Tekniska Högskolan (Royal Institute of Technology, Stockholm, Sweden). All rights reserved. Modified: user/ngie/more-tests2/contrib/dma/README.markdown ============================================================================== --- user/ngie/more-tests2/contrib/dma/README.markdown Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/README.markdown Sun Oct 11 08:26:48 2015 (r289134) @@ -15,13 +15,8 @@ incoming connections. Building -------- -In Linux: - make -In BSD: - - cd bsd && make Installation ------------ Modified: user/ngie/more-tests2/contrib/dma/TODO ============================================================================== --- user/ngie/more-tests2/contrib/dma/TODO Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/TODO Sun Oct 11 08:26:48 2015 (r289134) @@ -1,4 +1,5 @@ - unquote/handle quoted local recipients +- use proper sysexit codes - handle/use ESMTP extensions - .forward support - suggest way to run a queue flush on boot Modified: user/ngie/more-tests2/contrib/dma/VERSION ============================================================================== --- user/ngie/more-tests2/contrib/dma/VERSION Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/VERSION Sun Oct 11 08:26:48 2015 (r289134) @@ -1 +1 @@ -v0.10 +v0.9 Modified: user/ngie/more-tests2/contrib/dma/aliases_parse.y ============================================================================== --- user/ngie/more-tests2/contrib/dma/aliases_parse.y Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/aliases_parse.y Sun Oct 11 08:26:48 2015 (r289134) @@ -7,6 +7,8 @@ extern int yylineno; static void yyerror(const char *); +int yywrap(void); +int yylex(void); static void yyerror(const char *msg) Modified: user/ngie/more-tests2/contrib/dma/aliases_scan.l ============================================================================== --- user/ngie/more-tests2/contrib/dma/aliases_scan.l Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/aliases_scan.l Sun Oct 11 08:26:48 2015 (r289134) @@ -1,11 +1,11 @@ %{ #include <string.h> -#include "dma.h" #include "aliases_parse.h" #define YY_NO_INPUT +int yylex(void); %} %option yylineno Modified: user/ngie/more-tests2/contrib/dma/conf.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/conf.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/conf.c Sun Oct 11 08:26:48 2015 (r289134) @@ -64,7 +64,7 @@ trim_line(char *line) if (line[0] == '.') { if ((linelen + 2) > 1000) { syslog(LOG_CRIT, "Cannot escape leading dot. Buffer overflow"); - exit(EX_DATAERR); + exit(1); } memmove((line + 1), line, (linelen + 1)); line[0] = '.'; @@ -101,7 +101,7 @@ parse_authfile(const char *path) a = fopen(path, "r"); if (a == NULL) { - errlog(EX_NOINPUT, "can not open auth file `%s'", path); + errlog(1, "can not open auth file `%s'", path); /* NOTREACHED */ } @@ -121,7 +121,7 @@ parse_authfile(const char *path) au = calloc(1, sizeof(*au)); if (au == NULL) - errlog(EX_OSERR, NULL); + errlog(1, "calloc failed"); data = strdup(line); au->login = strsep(&data, "|"); @@ -131,7 +131,8 @@ parse_authfile(const char *path) if (au->login == NULL || au->host == NULL || au->password == NULL) { - errlogx(EX_CONFIG, "syntax error in authfile %s:%d", path, lineno); + errlogx(1, "syntax error in authfile %s:%d", + path, lineno); /* NOTREACHED */ } @@ -159,7 +160,7 @@ parse_conf(const char *config_path) /* Don't treat a non-existing config file as error */ if (errno == ENOENT) return; - errlog(EX_NOINPUT, "can not open config `%s'", config_path); + errlog(1, "can not open config `%s'", config_path); /* NOTREACHED */ } @@ -210,7 +211,7 @@ parse_conf(const char *config_path) } else { host = data; } - if (host && *host == 0) + if (host && *host == 0) host = NULL; if (user && *user == 0) user = NULL; @@ -231,13 +232,13 @@ parse_conf(const char *config_path) else if (strcmp(word, "NULLCLIENT") == 0 && data == NULL) config.features |= NULLCLIENT; else { - errlogx(EX_CONFIG, "syntax error in %s:%d", config_path, lineno); + errlogx(1, "syntax error in %s:%d", config_path, lineno); /* NOTREACHED */ } } if ((config.features & NULLCLIENT) && config.smarthost == NULL) { - errlogx(EX_CONFIG, "%s: NULLCLIENT requires SMARTHOST", config_path); + errlogx(1, "%s: NULLCLIENT requires SMARTHOST", config_path); /* NOTREACHED */ } Modified: user/ngie/more-tests2/contrib/dma/dma-mbox-create.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/dma-mbox-create.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/dma-mbox-create.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,9 @@ /* - * Copyright (c) 2010-2014, Simon Schubert <2@0x2c.org>. + * Copyright (c) 2010 Simon Schubert <2@0x2c.org> * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org>. + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -54,7 +54,7 @@ static void -logfail(int exitcode, const char *fmt, ...) +logfail(const char *fmt, ...) { int oerrno = errno; va_list ap; @@ -73,7 +73,7 @@ logfail(int exitcode, const char *fmt, . else syslog(LOG_ERR, errno ? "%m" : "unknown error"); - exit(exitcode); + exit(1); } /* @@ -98,21 +98,21 @@ main(int argc, char **argv) errno = 0; gr = getgrnam(DMA_GROUP); if (!gr) - logfail(EX_CONFIG, "cannot find dma group `%s'", DMA_GROUP); + logfail("cannot find dma group `%s'", DMA_GROUP); mail_gid = gr->gr_gid; if (setgid(mail_gid) != 0) - logfail(EX_NOPERM, "cannot set gid to %d (%s)", mail_gid, DMA_GROUP); + logfail("cannot set gid to %d (%s)", mail_gid, DMA_GROUP); if (getegid() != mail_gid) - logfail(EX_NOPERM, "cannot set gid to %d (%s), still at %d", mail_gid, DMA_GROUP, getegid()); + logfail("cannot set gid to %d (%s), still at %d", mail_gid, DMA_GROUP, getegid()); /* * We take exactly one argument: the username. */ if (argc != 2) { errno = 0; - logfail(EX_USAGE, "no arguments"); + logfail("no arguments"); } user = argv[1]; @@ -121,7 +121,7 @@ main(int argc, char **argv) /* the username may not contain a pathname separator */ if (strchr(user, '/')) { errno = 0; - logfail(EX_DATAERR, "path separator in username `%s'", user); + logfail("path separator in username `%s'", user); exit(1); } @@ -129,7 +129,7 @@ main(int argc, char **argv) errno = 0; pw = getpwnam(user); if (!pw) - logfail(EX_NOUSER, "cannot find user `%s'", user); + logfail("cannot find user `%s'", user); user_uid = pw->pw_uid; @@ -137,20 +137,20 @@ main(int argc, char **argv) if (error < 0 || (size_t)error >= sizeof(fn)) { if (error >= 0) { errno = 0; - logfail(EX_USAGE, "mbox path too long"); + logfail("mbox path too long"); } - logfail(EX_CANTCREAT, "cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user); + logfail("cannot build mbox path for `%s/%s'", _PATH_MAILDIR, user); } f = open(fn, O_RDONLY|O_CREAT, 0600); if (f < 0) - logfail(EX_NOINPUT, "cannt open mbox `%s'", fn); + logfail("cannot open mbox `%s'", fn); if (fchown(f, user_uid, mail_gid)) - logfail(EX_OSERR, "cannot change owner of mbox `%s'", fn); + logfail("cannot change owner of mbox `%s'", fn); if (fchmod(f, 0620)) - logfail(EX_OSERR, "cannot change permissions of mbox `%s'", fn); + logfail("cannot change permissions of mbox `%s'", fn); /* file should be present with the right owner and permissions */ Modified: user/ngie/more-tests2/contrib/dma/dma.8 ============================================================================== --- user/ngie/more-tests2/contrib/dma/dma.8 Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/dma.8 Sun Oct 11 08:26:48 2015 (r289134) @@ -1,5 +1,4 @@ .\" -.\" Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. .\" Copyright (c) 2008 .\" The DragonFly Project. All rights reserved. .\" Modified: user/ngie/more-tests2/contrib/dma/dma.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/dma.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/dma.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,8 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org>. + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -248,7 +247,7 @@ go_background(struct queue *queue) if (daemonize && daemon(0, 0) != 0) { syslog(LOG_ERR, "can not daemonize: %m"); - exit(EX_OSERR); + exit(1); } daemonize = 0; @@ -265,7 +264,7 @@ go_background(struct queue *queue) switch (pid) { case -1: syslog(LOG_ERR, "can not fork: %m"); - exit(EX_OSERR); + exit(1); break; case 0: @@ -287,11 +286,11 @@ retit: break; case 1: if (doqueue) - exit(EX_OK); + exit(0); syslog(LOG_WARNING, "could not lock queue file"); - exit(EX_SOFTWARE); + exit(1); default: - exit(EX_SOFTWARE); + exit(1); } dropspool(queue, it); return (it); @@ -307,7 +306,7 @@ retit: } syslog(LOG_CRIT, "reached dead code"); - exit(EX_SOFTWARE); + exit(1); } static void @@ -332,12 +331,12 @@ retry: case 0: delqueue(it); syslog(LOG_INFO, "delivery successful"); - exit(EX_OK); + exit(0); case 1: if (stat(it->queuefn, &st) != 0) { syslog(LOG_ERR, "lost queue file `%s'", it->queuefn); - exit(EX_SOFTWARE); + exit(1); } if (gettimeofday(&now, NULL) == 0 && (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) { @@ -439,16 +438,16 @@ main(int argc, char **argv) pw = getpwnam(DMA_ROOT_USER); if (pw == NULL) { if (errno == 0) - errx(EX_CONFIG, "user '%s' not found", DMA_ROOT_USER); + errx(1, "user '%s' not found", DMA_ROOT_USER); else - err(EX_OSERR, "cannot drop root privileges"); + err(1, "cannot drop root privileges"); } if (setuid(pw->pw_uid) != 0) - err(EX_OSERR, "cannot drop root privileges"); + err(1, "cannot drop root privileges"); if (geteuid() == 0 || getuid() == 0) - errx(EX_OSERR, "cannot drop root privileges"); + errx(1, "cannot drop root privileges"); } atexit(deltmp); @@ -461,15 +460,15 @@ main(int argc, char **argv) argv++; argc--; showq = 1; if (argc != 0) - errx(EX_USAGE, "invalid arguments"); + errx(1, "invalid arguments"); goto skipopts; } else if (strcmp(argv[0], "newaliases") == 0) { logident_base = "dma"; setlogident("%s", logident_base); if (read_aliases() != 0) - errx(EX_SOFTWARE, "could not parse aliases file `%s'", config.aliases); - exit(EX_OK); + errx(1, "could not parse aliases file `%s'", config.aliases); + exit(0); } opterr = 0; @@ -548,7 +547,7 @@ main(int argc, char **argv) default: fprintf(stderr, "invalid argument: `-%c'\n", optopt); - exit(EX_USAGE); + exit(1); } } argc -= optind; @@ -556,10 +555,10 @@ main(int argc, char **argv) opterr = 1; if (argc != 0 && (showq || doqueue)) - errx(EX_USAGE, "sending mail and queue operations are mutually exclusive"); + errx(1, "sending mail and queue operations are mutually exclusive"); if (showq + doqueue > 1) - errx(EX_USAGE, "conflicting queue operations"); + errx(1, "conflicting queue operations"); skipopts: if (logident_base == NULL) @@ -579,7 +578,7 @@ skipopts: if (showq) { if (load_queue(&queue) < 0) - errlog(EX_NOINPUT, "can not load queue"); + errlog(1, "can not load queue"); show_queue(&queue); return (0); } @@ -587,38 +586,38 @@ skipopts: if (doqueue) { flushqueue_signal(); if (load_queue(&queue) < 0) - errlog(EX_NOINPUT, "can not load queue"); + errlog(1, "can not load queue"); run_queue(&queue); return (0); } if (read_aliases() != 0) - errlog(EX_SOFTWARE, "could not parse aliases file `%s'", config.aliases); + errlog(1, "could not parse aliases file `%s'", config.aliases); if ((sender = set_from(&queue, sender)) == NULL) - errlog(EX_SOFTWARE, NULL); + errlog(1, "set_from failed"); if (newspoolf(&queue) != 0) - errlog(EX_CANTCREAT, "can not create temp file in `%s'", config.spooldir); + errlog(1, "can not create temp file in `%s'", config.spooldir); setlogident("%s", queue.id); for (i = 0; i < argc; i++) { if (add_recp(&queue, argv[i], EXPAND_WILDCARD) != 0) - errlogx(EX_DATAERR, "invalid recipient `%s'", argv[i]); + errlogx(1, "invalid recipient `%s'", argv[i]); } if (LIST_EMPTY(&queue.queue) && !recp_from_header) - errlogx(EX_NOINPUT, "no recipients"); + errlogx(1, "no recipients"); if (readmail(&queue, nodot, recp_from_header) != 0) - errlog(EX_NOINPUT, "can not read mail"); + errlog(1, "can not read mail"); if (LIST_EMPTY(&queue.queue)) - errlogx(EX_NOINPUT, "no recipients"); + errlogx(1, "no recipients"); if (linkspool(&queue) != 0) - errlog(EX_CANTCREAT, "can not create spools"); + errlog(1, "can not create spools"); /* From here on the mail is safe. */ Modified: user/ngie/more-tests2/contrib/dma/dma.h ============================================================================== --- user/ngie/more-tests2/contrib/dma/dma.h Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/dma.h Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,8 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org> and + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de> and * Matthias Schmidt <matthias@dragonflybsd.org>. * * Redistribution and use in source and binary forms, with or without @@ -44,7 +43,6 @@ #include <arpa/inet.h> #include <openssl/ssl.h> #include <netdb.h> -#include <sysexits.h> #define VERSION "DragonFly Mail Agent " DMA_VERSION @@ -175,8 +173,6 @@ extern char errmsg[ERRMSG_SIZE]; /* aliases_parse.y */ int yyparse(void); -int yywrap(void); -int yylex(void); extern FILE *yyin; /* conf.c */ Modified: user/ngie/more-tests2/contrib/dma/dns.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/dns.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/dns.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,8 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org>. + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -68,6 +67,7 @@ add_host(int pref, const char *host, int char servname[10]; struct mx_hostentry *p; const int count_inc = 10; + int err; memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_UNSPEC; @@ -75,26 +75,9 @@ add_host(int pref, const char *host, int hints.ai_protocol = IPPROTO_TCP; snprintf(servname, sizeof(servname), "%d", port); - switch (getaddrinfo(host, servname, &hints, &res0)) { - case 0: - break; - case EAI_AGAIN: - case EAI_NONAME: - /* - * EAI_NONAME gets returned for: - * SMARTHOST set but DNS server not reachable -> defer - * SMARTHOST set but DNS server returns "host does not exist" - * -> buggy configuration - * -> either defer or bounce would be ok -> defer - * MX entry was returned by DNS server but name doesn't resolve - * -> hopefully transient situation -> defer - * all other DNS problems should have been caught earlier - * in dns_get_mx_list(). - */ - goto out; - default: - return(-1); - } + err = getaddrinfo(host, servname, &hints, &res0); + if (err) + return (err == EAI_AGAIN ? 1 : -1); for (res = res0; res != NULL; res = res->ai_next) { if (*ps + 1 >= roundup(*ps, count_inc)) { Modified: user/ngie/more-tests2/contrib/dma/get-version.sh ============================================================================== --- user/ngie/more-tests2/contrib/dma/get-version.sh Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/get-version.sh Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,7 @@ #!/bin/sh -tmp=$1 -file=${tmp:=VERSION} gitver=$(git describe 2>/dev/null | tr - .) -filever=$(cat ${file} 2>/dev/null) +filever=$(cat VERSION) version=${gitver} : ${version:=$filever} Modified: user/ngie/more-tests2/contrib/dma/local.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/local.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/local.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,8 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org>. + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -82,7 +81,7 @@ create_mbox(const char *name) execl(LIBEXEC_PATH "/dma-mbox-create", "dma-mbox-create", name, NULL); syslog(LOG_ERR, "cannot execute "LIBEXEC_PATH"/dma-mbox-create: %m"); - exit(EX_SOFTWARE); + exit(1); default: /* parent */ Modified: user/ngie/more-tests2/contrib/dma/mail.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/mail.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/mail.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,8 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org>. + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -52,7 +51,7 @@ bounce(struct qitem *it, const char *rea /* Don't bounce bounced mails */ if (it->sender[0] == 0) { syslog(LOG_INFO, "can not bounce a bounce message, discarding"); - exit(EX_SOFTWARE); + exit(1); } bzero(&bounceq, sizeof(bounceq)); @@ -133,7 +132,7 @@ bounce(struct qitem *it, const char *rea fail: syslog(LOG_CRIT, "error creating bounce: %m"); delqueue(it); - exit(EX_IOERR); + exit(1); } struct parse_state { @@ -333,10 +332,10 @@ newaddr: ps->pos = 0; addr = strdup(ps->addr); if (addr == NULL) - errlog(EX_SOFTWARE, NULL); + errlog(1, "strdup failed"); if (add_recp(queue, addr, EXPAND_WILDCARD) != 0) - errlogx(EX_DATAERR, "invalid recipient `%s'", addr); + errlogx(1, "invalid recipient `%s'", addr); goto again; } @@ -375,9 +374,7 @@ readmail(struct queue *queue, int nodot, if (fgets(line, sizeof(line) - 1, stdin) == NULL) break; if (had_last_line) - errlogx(EX_DATAERR, "bad mail input format:" - " from %s (uid %d) (envelope-from %s)", - username, useruid, queue->sender); + errlogx(1, "bad mail input format"); linelen = strlen(line); if (linelen == 0 || line[linelen - 1] != '\n') { /* @@ -408,7 +405,7 @@ readmail(struct queue *queue, int nodot, if (parse_state.state != NONE) { if (parse_addrs(&parse_state, line, queue) < 0) { - errlogx(EX_DATAERR, "invalid address in header\n"); + errlogx(1, "invalid address in header\n"); /* NOTREACHED */ } } @@ -419,7 +416,7 @@ readmail(struct queue *queue, int nodot, strprefixcmp(line, "Bcc:") == 0)) { parse_state.state = START; if (parse_addrs(&parse_state, line, queue) < 0) { - errlogx(EX_DATAERR, "invalid address in header\n"); + errlogx(1, "invalid address in header\n"); /* NOTREACHED */ } } Modified: user/ngie/more-tests2/contrib/dma/net.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/net.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/net.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,5 +1,4 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project Modified: user/ngie/more-tests2/contrib/dma/spool.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/spool.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/spool.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,8 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org>. + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -290,7 +289,7 @@ load_queue(struct queue *queue) spooldir = opendir(config.spooldir); if (spooldir == NULL) - err(EX_NOINPUT, "reading queue"); + err(1, "reading queue"); while ((de = readdir(spooldir)) != NULL) { queuefn = NULL; Modified: user/ngie/more-tests2/contrib/dma/util.c ============================================================================== --- user/ngie/more-tests2/contrib/dma/util.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/contrib/dma/util.c Sun Oct 11 08:26:48 2015 (r289134) @@ -1,9 +1,8 @@ /* - * Copyright (c) 2008-2014, Simon Schubert <2@0x2c.org>. * Copyright (c) 2008 The DragonFly Project. All rights reserved. * * This code is derived from software contributed to The DragonFly Project - * by Simon Schubert <2@0x2c.org>. + * by Simon 'corecode' Schubert <corecode@fs.ei.tum.de>. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/ngie/more-tests2/lib/libc/sys/shmctl.2 ============================================================================== --- user/ngie/more-tests2/lib/libc/sys/shmctl.2 Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/lib/libc/sys/shmctl.2 Sun Oct 11 08:26:48 2015 (r289134) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 10, 2015 +.Dd July 17, 1995 .Dt SHMCTL 2 .Os .Sh NAME @@ -72,18 +72,15 @@ or it must have superuser privileges. .It Dv IPC_RMID Removes the segment from the system. The removal will not take -effect until all processes having attached the segment have exited. +effect until all processes having attached the segment have exited; +however, once the IPC_RMID operation has taken place, no further +processes will be allowed to attach the segment. For the operation to succeed, the calling process's effective uid must match .Fa shm_perm.uid or .Fa shm_perm.cuid , or the process must have superuser privileges. -If the -.Va kern.ipc.shm_allow_removed -.Xr sysctl 3 -variable is set to 0, once the IPC_RMID operation has taken place, -no further processes will be allowed to attach the segment. .\" .It Dv SHM_LOCK .\" Locks the segment in memory. The calling process must have .\" superuser privileges. Not implemented in FreeBSD. Modified: user/ngie/more-tests2/libexec/dma/Makefile.inc ============================================================================== --- user/ngie/more-tests2/libexec/dma/Makefile.inc Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/libexec/dma/Makefile.inc Sun Oct 11 08:26:48 2015 (r289134) @@ -7,7 +7,7 @@ DMA_SOURCES= ${.CURDIR}/../../../contrib CFLAGS= -I${DMA_SOURCES} \ -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME \ -DCONF_PATH='"/etc/dma"' \ - -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.10"' \ + -DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"' \ -DDMA_ROOT_USER='"mailnull"' \ -DDMA_GROUP='"mail"' BINGRP= mail Modified: user/ngie/more-tests2/libexec/dma/dmagent/Makefile ============================================================================== --- user/ngie/more-tests2/libexec/dma/dmagent/Makefile Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/libexec/dma/dmagent/Makefile Sun Oct 11 08:26:48 2015 (r289134) @@ -17,7 +17,7 @@ SRCS= aliases_parse.y \ util.c MAN8= dma.8 CONFS= dma.conf -CONFSDIR= ${CONFIGDIR}/dma +CONFSDIR= ${ETCDIR}/dma YFLAGS+= -i CLEANFILES= aliases_parse.i FILES= mailer.conf Modified: user/ngie/more-tests2/sbin/geom/class/nop/gnop.8 ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/nop/gnop.8 Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/sbin/geom/class/nop/gnop.8 Sun Oct 11 08:26:48 2015 (r289134) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 10, 2015 +.Dd September 15, 2015 .Dt GNOP 8 .Os .Sh NAME @@ -72,10 +72,9 @@ The utility is used for setting up transparent providers on existing ones. Its main purpose is testing other GEOM classes, as it allows forced provider removal and I/O error simulation with a given probability. -It also gathers statistics on the number of read, write, delete, -getattr, flush, and other requests, and the number of bytes read and written. -.Nm -can also be used as a good starting point for implementing new GEOM +It also gathers the following statistics: number of read requests, number of +write requests, number of bytes read and number of bytes written. +In addition, it can be used as a good starting point for implementing new GEOM classes. .Pp The first argument to Modified: user/ngie/more-tests2/sbin/mdconfig/mdconfig.8 ============================================================================== --- user/ngie/more-tests2/sbin/mdconfig/mdconfig.8 Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/sbin/mdconfig/mdconfig.8 Sun Oct 11 08:26:48 2015 (r289134) @@ -37,7 +37,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 10, 2015 +.Dd August 6, 2015 .Dt MDCONFIG 8 .Os .Sh NAME @@ -159,11 +159,11 @@ prefix. Size of the memory disk. .Ar Size is the number of 512 byte sectors unless suffixed with a -.Cm b , k , m , g , t , +.Cm b , k , m , g , or -.Cm p +.Cm t which -denotes byte, kilobyte, megabyte, gigabyte, terabyte and petabyte respectively. +denotes byte, kilobyte, megabyte, gigabyte and terabyte respectively. When used without the .Fl r option, the Modified: user/ngie/more-tests2/sbin/mdconfig/mdconfig.c ============================================================================== --- user/ngie/more-tests2/sbin/mdconfig/mdconfig.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/sbin/mdconfig/mdconfig.c Sun Oct 11 08:26:48 2015 (r289134) @@ -88,8 +88,8 @@ usage(void) fprintf(stderr, "\t\ttype = {malloc, vnode, swap}\n"); fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n"); fprintf(stderr, "\t\tsize = %%d (512 byte blocks), %%db (B),\n"); - fprintf(stderr, "\t\t %%dk (kB), %%dm (MB), %%dg (GB), \n"); - fprintf(stderr, "\t\t %%dt (TB), or %%dp (PB)\n"); + fprintf(stderr, "\t\t %%dk (kB), %%dm (MB), %%dg (GB) or\n"); + fprintf(stderr, "\t\t %%dt (TB)\n"); exit(1); } @@ -217,9 +217,6 @@ main(int argc, char **argv) else if (*p == 't' || *p == 'T') { mdio.md_mediasize <<= 30; mdio.md_mediasize <<= 10; - } else if (*p == 'p' || *p == 'P') { - mdio.md_mediasize <<= 30; - mdio.md_mediasize <<= 20; } else errx(1, "unknown suffix on -s argument"); break; Modified: user/ngie/more-tests2/share/man/man4/vtnet.4 ============================================================================== --- user/ngie/more-tests2/share/man/man4/vtnet.4 Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/share/man/man4/vtnet.4 Sun Oct 11 08:26:48 2015 (r289134) @@ -52,9 +52,9 @@ device driver provides support for VirtI If the hypervisor advertises the appreciate features, the .Nm driver supports TCP/UDP checksum offload for both transmit and receive, -TCP segmentation offload (TSO), TCP large receive offload (LRO), -hardware VLAN tag stripping/insertion features, a multicast hash filter, -as well as Jumbo Frames (up to 9216 bytes), which can be +TCP segmentation offload (TSO), TCP large receive offload (LRO), and +hardware VLAN tag stripping/insertion features, as well as a multicast +hash filter, as well as Jumbo Frames (up to 9216 bytes), which can be configured via the interface MTU setting. Selecting an MTU larger than 1500 bytes with the .Xr ifconfig 8 Modified: user/ngie/more-tests2/share/mk/Makefile ============================================================================== --- user/ngie/more-tests2/share/mk/Makefile Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/share/mk/Makefile Sun Oct 11 08:26:48 2015 (r289134) @@ -13,7 +13,6 @@ FILES= \ bsd.README \ bsd.arch.inc.mk \ bsd.compiler.mk \ - bsd.confs.mk \ bsd.cpu.mk \ bsd.crunchgen.mk \ bsd.dep.mk \ Modified: user/ngie/more-tests2/share/mk/bsd.confs.mk ============================================================================== --- user/ngie/more-tests2/share/mk/bsd.confs.mk Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/share/mk/bsd.confs.mk Sun Oct 11 08:26:48 2015 (r289134) @@ -22,7 +22,7 @@ all: buildconfig ${group}OWN?= ${SHAREOWN} ${group}GRP?= ${SHAREGRP} ${group}MODE?= ${CONFMODE} -${group}DIR?= ${CONFIGDIR}/ +${group}DIR?= ${ETCDIR}/ STAGE_SETS+= ${group} STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR} STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP} Modified: user/ngie/more-tests2/share/mk/bsd.own.mk ============================================================================== --- user/ngie/more-tests2/share/mk/bsd.own.mk Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/share/mk/bsd.own.mk Sun Oct 11 08:26:48 2015 (r289134) @@ -213,7 +213,7 @@ NLSGRP?= ${SHAREGRP} NLSMODE?= ${NOBINMODE} INCLUDEDIR?= /usr/include -CONFIGDIR?= /etc +ETCDIR?= /etc # # install(1) parameters. Modified: user/ngie/more-tests2/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- user/ngie/more-tests2/sys/dev/cxgbe/iw_cxgbe/cm.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/sys/dev/cxgbe/iw_cxgbe/cm.c Sun Oct 11 08:26:48 2015 (r289134) @@ -99,7 +99,7 @@ static int abort_connection(struct c4iw_ static void peer_close_upcall(struct c4iw_ep *ep); static void peer_abort_upcall(struct c4iw_ep *ep); static void connect_reply_upcall(struct c4iw_ep *ep, int status); -static int connect_request_upcall(struct c4iw_ep *ep); +static void connect_request_upcall(struct c4iw_ep *ep); static void established_upcall(struct c4iw_ep *ep); static void process_mpa_reply(struct c4iw_ep *ep); static void process_mpa_request(struct c4iw_ep *ep); @@ -1216,6 +1216,7 @@ static int abort_connection(struct c4iw_ int err; CTR2(KTR_IW_CXGBE, "%s:abB %p", __func__, ep); + close_complete_upcall(ep, -ECONNRESET); state_set(&ep->com, ABORTING); abort_socket(ep); err = close_socket(&ep->com, 0); @@ -1318,10 +1319,9 @@ static void connect_reply_upcall(struct CTR2(KTR_IW_CXGBE, "%s:cruE %p", __func__, ep); } -static int connect_request_upcall(struct c4iw_ep *ep) +static void connect_request_upcall(struct c4iw_ep *ep) { struct iw_cm_event event; - int ret; CTR3(KTR_IW_CXGBE, "%s: ep %p, mpa_v1 %d", __func__, ep, ep->tried_with_mpa_v1); @@ -1355,14 +1355,10 @@ static int connect_request_upcall(struct } c4iw_get_ep(&ep->com); - ret = ep->parent_ep->com.cm_id->event_handler(ep->parent_ep->com.cm_id, + ep->parent_ep->com.cm_id->event_handler(ep->parent_ep->com.cm_id, &event); - if(ret) - c4iw_put_ep(&ep->com); - set_bit(CONNREQ_UPCALL, &ep->com.history); c4iw_put_ep(&ep->parent_ep->com); - return ret; } static void established_upcall(struct c4iw_ep *ep) @@ -1839,11 +1835,9 @@ abort: /* drive upcall */ mutex_lock(&ep->parent_ep->com.mutex); - if (ep->parent_ep->com.state != DEAD) { - if(connect_request_upcall(ep)) { - abort_connection(ep); - } - }else + if (ep->parent_ep->com.state != DEAD) + connect_request_upcall(ep); + else abort_connection(ep); mutex_unlock(&ep->parent_ep->com.mutex); } @@ -2219,7 +2213,7 @@ int c4iw_ep_disconnect(struct c4iw_ep *e CTR2(KTR_IW_CXGBE, "%s:ced1 %p", __func__, ep); fatal = 1; - close_complete_upcall(ep, -ECONNRESET); + close_complete_upcall(ep, -EIO); ep->com.state = DEAD; } CTR3(KTR_IW_CXGBE, "%s:ced2 %p %s", __func__, ep, Modified: user/ngie/more-tests2/sys/dev/drm2/i915/i915_gem.c ============================================================================== --- user/ngie/more-tests2/sys/dev/drm2/i915/i915_gem.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/sys/dev/drm2/i915/i915_gem.c Sun Oct 11 08:26:48 2015 (r289134) @@ -2527,8 +2527,10 @@ i915_gem_object_unbind(struct drm_i915_g if (obj->gtt_space == NULL) return 0; - if (obj->pin_count) + if (obj->pin_count) { + DRM_ERROR("Attempting to unbind pinned buffer\n"); return -EINVAL; + } ret = i915_gem_object_finish_gpu(obj); if (ret == -ERESTARTSYS || ret == -EINTR) Modified: user/ngie/more-tests2/sys/dev/iicbus/icee.c ============================================================================== --- user/ngie/more-tests2/sys/dev/iicbus/icee.c Sun Oct 11 08:21:49 2015 (r289133) +++ user/ngie/more-tests2/sys/dev/iicbus/icee.c Sun Oct 11 08:26:48 2015 (r289134) @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); struct icee_softc { device_t sc_dev; /* Myself */ - device_t sc_busdev; /* Parent bus */ + struct sx sc_lock; /* basically a perimeter lock */ struct cdev *cdev; /* user interface */ int addr; int size; /* How big am I? */ @@ -57,6 +57,12 @@ struct icee_softc { int wr_sz; /* What's the write page size */ }; +#define ICEE_LOCK(_sc) sx_xlock(&(_sc)->sc_lock) +#define ICEE_UNLOCK(_sc) sx_xunlock(&(_sc)->sc_lock) +#define ICEE_LOCK_INIT(_sc) sx_init(&_sc->sc_lock, "icee") *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510110826.t9B8QnaW044339>