svn commit: r338608 - in head/sys: net sys

2018-09-12 Thread Ruslan Bukin
Author: br
Date: Wed Sep 12 08:05:33 2018
New Revision: 338608
URL: https://svnweb.freebsd.org/changeset/base/338608

Log:
  Don't mark module data as static on RISC-V.
  
  Similar to arm64, riscv compiler uses PC-relative loads/stores,
  and with static data compiler does not emit relocations.
  In result, kernel module linker has nothing to fix and data accessed
  from the wrong location.
  
  Approved by:  re (gjb)
  Sponsored by: DARPA, AFRL

Modified:
  head/sys/net/vnet.h
  head/sys/sys/pcpu.h

Modified: head/sys/net/vnet.h
==
--- head/sys/net/vnet.h Wed Sep 12 05:08:49 2018(r338607)
+++ head/sys/net/vnet.h Wed Sep 12 08:05:33 2018(r338608)
@@ -273,7 +273,7 @@ extern struct sx vnet_sxlock;
 /* struct _hack is to stop this from being used with static data */
 #defineVNET_DEFINE(t, n)   \
 struct _hack; t VNET_NAME(n) __section(VNET_SETNAME) __used
-#if defined(KLD_MODULE) && defined(__aarch64__)
+#if defined(KLD_MODULE) && (defined(__aarch64__) || defined(__riscv))
 /*
  * As with DPCPU_DEFINE_STATIC we are unable to mark this data as static
  * in modules on some architectures.

Modified: head/sys/sys/pcpu.h
==
--- head/sys/sys/pcpu.h Wed Sep 12 05:08:49 2018(r338607)
+++ head/sys/sys/pcpu.h Wed Sep 12 08:05:33 2018(r338608)
@@ -84,7 +84,7 @@ extern uintptr_t dpcpu_off[];
 /* struct _hack is to stop this from being used with the static keyword. */
 #defineDPCPU_DEFINE(t, n)  \
 struct _hack; t DPCPU_NAME(n) __section(DPCPU_SETNAME) __used
-#if defined(KLD_MODULE) && defined(__aarch64__)
+#if defined(KLD_MODULE) && (defined(__aarch64__) || defined(__riscv))
 /*
  * On some architectures the compiler will use PC-relative load to
  * find the address of DPCPU data with the static keyword. We then
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r338609 - head/sys/riscv/riscv

2018-09-12 Thread Ruslan Bukin
Author: br
Date: Wed Sep 12 08:12:34 2018
New Revision: 338609
URL: https://svnweb.freebsd.org/changeset/base/338609

Log:
  Use elf_relocaddr() to find the address for R_RISCV_RELATIVE
  relocation.
  
  elf_relocaddr() has a hook to handle VIMAGE data addresses.
  
  This fixes VIMAGE support for RISC-V when built as a module.
  
  Approved by:  re (gjb)
  Sponsored by: DARPA, AFRL

Modified:
  head/sys/riscv/riscv/elf_machdep.c

Modified: head/sys/riscv/riscv/elf_machdep.c
==
--- head/sys/riscv/riscv/elf_machdep.c  Wed Sep 12 08:05:33 2018
(r338608)
+++ head/sys/riscv/riscv/elf_machdep.c  Wed Sep 12 08:12:34 2018
(r338609)
@@ -330,11 +330,9 @@ elf_reloc_internal(linker_file_t lf, Elf_Addr relocbas
break;
 
case R_RISCV_RELATIVE:
-   val = relocbase + addend;
-
before64 = *where;
-   if (*where != val)
-   *where = val;
+
+   *where = elf_relocaddr(lf, relocbase + addend);
 
if (debug_kld)
printf("%p %c %-24s %016lx -> %016lx\n",
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r338610 - head/sys/riscv/conf

2018-09-12 Thread Ruslan Bukin
Author: br
Date: Wed Sep 12 08:13:54 2018
New Revision: 338610
URL: https://svnweb.freebsd.org/changeset/base/338610

Log:
  Enable VIMAGE support for RISC-V.
  
  Approved by:  re (gjb)
  Sponsored by: DARPA, AFRL

Modified:
  head/sys/riscv/conf/GENERIC

Modified: head/sys/riscv/conf/GENERIC
==
--- head/sys/riscv/conf/GENERIC Wed Sep 12 08:12:34 2018(r338609)
+++ head/sys/riscv/conf/GENERIC Wed Sep 12 08:13:54 2018(r338610)
@@ -30,7 +30,7 @@ makeoptions   WITHOUT_MODULES="usb otusfw mwlfw ispfw mw
 
 optionsSCHED_ULE   # ULE scheduler
 optionsPREEMPTION  # Enable kernel thread preemption
-# options  VIMAGE  # Subsystem virtualization, e.g. VNET
+optionsVIMAGE  # Subsystem virtualization, e.g. VNET
 optionsINET# InterNETworking
 optionsINET6   # IPv6 communications protocols
 optionsTCP_HHOOK   # hhook(9) framework for TCP
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r338613 - head/contrib/tcpdump

2018-09-12 Thread Hans Petter Selasky
Author: hselasky
Date: Wed Sep 12 10:09:59 2018
New Revision: 338613
URL: https://svnweb.freebsd.org/changeset/base/338613

Log:
  Fix for backends which doesn't support capsicum.
  
  Not all libpcap backends use the BPF compatible set
  of IOCTLs. For example the mlx5 backend uses libibverbs
  which is currently not capsicum compatible.
  
  Disable sandboxing for such backends.
  
  MFC after:3 days
  Discussed with:   emaste@
  Approved by:  re (kib)
  Sponsored by: Mellanox Technologies

Modified:
  head/contrib/tcpdump/tcpdump.c

Modified: head/contrib/tcpdump/tcpdump.c
==
--- head/contrib/tcpdump/tcpdump.c  Wed Sep 12 08:56:08 2018
(r338612)
+++ head/contrib/tcpdump/tcpdump.c  Wed Sep 12 10:09:59 2018
(r338613)
@@ -2069,6 +2069,9 @@ main(int argc, char **argv)
 #else
cansandbox = (cansandbox && ndo->ndo_nflag);
 #endif /* HAVE_CASPER */
+   cansandbox = (cansandbox && (pcap_fileno(pd) != -1 ||
+   RFileName != NULL));
+
if (cansandbox && cap_enter() < 0 && errno != ENOSYS)
error("unable to enter the capability mode");
 #endif /* HAVE_CAPSICUM */
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


svn commit: r338614 - head/sys/netinet/tcp_stacks

2018-09-12 Thread Michael Tuexen
Author: tuexen
Date: Wed Sep 12 10:27:58 2018
New Revision: 338614
URL: https://svnweb.freebsd.org/changeset/base/338614

Log:
  Fix TCP Fast Open for the TCP RACK stack.
  
  * Fix a bug where the SYN handling during established state was
applied to a front state.
  * Move a check for retransmission after the timer handling.
This was suppressing timer based retransmissions.
  * Fix an off-by one byte in the sequence number of retransmissions.
  * Apply fixes corresponding to
https://svnweb.freebsd.org/changeset/base/336934
  
  Reviewed by:  rrs@
  Approved by:  re (kib@)
  MFC after:1 month
  Sponsored by: Netflix, Inc.
  Differential Revision:https://reviews.freebsd.org/D16912

Modified:
  head/sys/netinet/tcp_stacks/rack.c

Modified: head/sys/netinet/tcp_stacks/rack.c
==
--- head/sys/netinet/tcp_stacks/rack.c  Wed Sep 12 10:09:59 2018
(r338613)
+++ head/sys/netinet/tcp_stacks/rack.c  Wed Sep 12 10:27:58 2018
(r338614)
@@ -5401,14 +5401,6 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, st
if (thflags & TH_RST)
return (rack_process_rst(m, th, so, tp));
/*
-* RFC5961 Section 4.2 Send challenge ACK for any SYN in
-* synchronized state.
-*/
-   if (thflags & TH_SYN) {
-   rack_challenge_ack(m, th, tp, &ret_val);
-   return (ret_val);
-   }
-   /*
 * RFC 1323 PAWS: If we have a timestamp reply on this segment and
 * it's less than ts_recent, drop it.
 */
@@ -5478,6 +5470,16 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, st
 * FIN-WAIT-1
 */
tp->t_starttime = ticks;
+   if (IS_FASTOPEN(tp->t_flags) && tp->t_tfo_pending) {
+   tcp_fastopen_decrement_counter(tp->t_tfo_pending);
+   tp->t_tfo_pending = NULL;
+
+   /*
+* Account for the ACK of our SYN prior to
+* regular ACK processing below.
+*/ 
+   tp->snd_una++;
+   }
if (tp->t_flags & TF_NEEDFIN) {
tcp_state_change(tp, TCPS_FIN_WAIT_1);
tp->t_flags &= ~TF_NEEDFIN;
@@ -5485,16 +5487,6 @@ rack_do_syn_recv(struct mbuf *m, struct tcphdr *th, st
tcp_state_change(tp, TCPS_ESTABLISHED);
TCP_PROBE5(accept__established, NULL, tp,
mtod(m, const char *), tp, th);
-   if (IS_FASTOPEN(tp->t_flags) && tp->t_tfo_pending) {
-   tcp_fastopen_decrement_counter(tp->t_tfo_pending);
-   tp->t_tfo_pending = NULL;
-
-   /*
-* Account for the ACK of our SYN prior to regular
-* ACK processing below.
-*/
-   tp->snd_una++;
-   }
/*
 * TFO connections call cc_conn_init() during SYN
 * processing.  Calling it again here for such connections
@@ -6924,16 +6916,6 @@ rack_output(struct tcpcb *tp)
if (tp->t_flags & TF_TOE)
return (tcp_offload_output(tp));
 #endif
-
-   /*
-* For TFO connections in SYN_RECEIVED, only allow the initial
-* SYN|ACK and those sent by the retransmit timer.
-*/
-   if (IS_FASTOPEN(tp->t_flags) &&
-   (tp->t_state == TCPS_SYN_RECEIVED) &&
-   SEQ_GT(tp->snd_max, tp->snd_una) &&/* initial SYN|ACK sent */
-   (rack->r_ctl.rc_resend == NULL)) /* not a retransmit */
-   return (0);
 #ifdef INET6
if (rack->r_state) {
/* Use the cache line loaded if possible */
@@ -6976,6 +6958,17 @@ rack_output(struct tcpcb *tp)
rack->r_wanted_output = 0;
rack->r_timer_override = 0;
/*
+* For TFO connections in SYN_SENT or SYN_RECEIVED,
+* only allow the initial SYN or SYN|ACK and those sent
+* by the retransmit timer.
+*/
+   if (IS_FASTOPEN(tp->t_flags) &&
+   ((tp->t_state == TCPS_SYN_RECEIVED) ||
+(tp->t_state == TCPS_SYN_SENT)) &&
+   SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN or SYN|ACK sent 
*/
+   (tp->t_rxtshift == 0))  /* not a retransmit */
+   return (0);
+   /*
 * Determine length of data that should be transmitted, and flags
 * that will be used. If there is some data or critical controls
 * (SYN, RST) to send, then transmit; otherwise, investigate
@@ -7353,8 +7346,10 @@ again:
(((flags & TH_SYN) && (tp->t_rxtshift > 0)) ||
 ((tp->t_state == TCPS_SYN_SENT) &&
  (tp->t_tfo_client_cookie_len == 0)) ||
-(flags & TH_RST)))
+(flags & TH_RST))) {
+   sack_rxmit = 0;
len = 0;
+   }
/* Without f

svn commit: r338616 - head/lib/libusb

2018-09-12 Thread Hans Petter Selasky
Author: hselasky
Date: Wed Sep 12 15:06:30 2018
New Revision: 338616
URL: https://svnweb.freebsd.org/changeset/base/338616

Log:
  Fix issues about cancelling USB transfers in LibUSB when the USB device has
  been detached. When a USB device has been detached the kernel file handle
  stops responding to commands. USB applications which continue to run after
  the USB device has been detached, depend on LibUSB generated events to tear
  down its pending USB transfers. Add code to handle the needed cleanup when
  processing the USB transfer(s) fails and prevent new USB transfer(s) from
  being submitted.
  
  Found by: Ludovic Rousseau 
  PR:   231076
  MFC after:1 week
  Approved by:  re (gjb)
  Sponsored by: Mellanox Technologies

Modified:
  head/lib/libusb/libusb10.c
  head/lib/libusb/libusb10.h
  head/lib/libusb/libusb10_io.c

Modified: head/lib/libusb/libusb10.c
==
--- head/lib/libusb/libusb10.c  Wed Sep 12 10:53:22 2018(r338615)
+++ head/lib/libusb/libusb10.c  Wed Sep 12 15:06:30 2018(r338616)
@@ -114,6 +114,19 @@ libusb_set_nonblocking(int f)
fcntl(f, F_SETFL, flags);
 }
 
+static void
+libusb10_wakeup_event_loop(libusb_context *ctx)
+{
+   uint8_t dummy = 0;
+   int err;
+
+   err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
+   if (err < (int)sizeof(dummy)) {
+   /* ignore error, if any */
+   DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "Waking up event loop 
failed!");
+   }
+}
+
 int
 libusb_init(libusb_context **context)
 {
@@ -484,7 +497,6 @@ libusb_open(libusb_device *dev, libusb_device_handle *
 {
libusb_context *ctx = dev->ctx;
struct libusb20_device *pdev = dev->os_priv;
-   uint8_t dummy;
int err;
 
if (devh == NULL)
@@ -506,12 +518,8 @@ libusb_open(libusb_device *dev, libusb_device_handle *
POLLOUT | POLLRDNORM | POLLWRNORM);
 
/* make sure our event loop detects the new device */
-   dummy = 0;
-   err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
-   if (err < (int)sizeof(dummy)) {
-   /* ignore error, if any */
-   DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open write 
failed!");
-   }
+   libusb10_wakeup_event_loop(ctx);
+
*devh = pdev;
 
return (0);
@@ -564,8 +572,6 @@ libusb_close(struct libusb20_device *pdev)
 {
libusb_context *ctx;
struct libusb_device *dev;
-   uint8_t dummy;
-   int err;
 
if (pdev == NULL)
return; /* be NULL safe */
@@ -581,12 +587,7 @@ libusb_close(struct libusb20_device *pdev)
libusb_unref_device(dev);
 
/* make sure our event loop detects the closed device */
-   dummy = 0;
-   err = write(ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
-   if (err < (int)sizeof(dummy)) {
-   /* ignore error, if any */
-   DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_close write 
failed!");
-   }
+   libusb10_wakeup_event_loop(ctx);
 }
 
 libusb_device *
@@ -1314,7 +1315,6 @@ libusb10_submit_transfer_sub(struct libusb20_device *p
int buffsize;
int maxframe;
int temp;
-   uint8_t dummy;
 
dev = libusb_get_device(pdev);
 
@@ -1415,10 +1415,8 @@ found:
 
 failure:
libusb10_complete_transfer(pxfer0, sxfer, LIBUSB_TRANSFER_ERROR);
-
/* make sure our event loop spins the done handler */
-   dummy = 0;
-   err = write(dev->ctx->ctrl_pipe[1], &dummy, sizeof(dummy));
+   libusb10_wakeup_event_loop(dev->ctx);
 }
 
 /* The following function must be called unlocked */
@@ -1459,6 +1457,8 @@ libusb_submit_transfer(struct libusb_transfer *uxfer)
(libusb20_tr_get_priv_sc1(pxfer0) == sxfer) ||
(libusb20_tr_get_priv_sc1(pxfer1) == sxfer)) {
err = LIBUSB_ERROR_BUSY;
+   } else if (dev->device_is_gone != 0) {
+   err = LIBUSB_ERROR_NO_DEVICE;
} else {
 
/* set pending state */
@@ -1490,6 +1490,7 @@ libusb_cancel_transfer(struct libusb_transfer *uxfer)
struct libusb20_transfer *pxfer1;
struct libusb_super_transfer *sxfer;
struct libusb_device *dev;
+   struct libusb_device_handle *devh;
uint8_t endpoint;
int retval;
 
@@ -1497,12 +1498,12 @@ libusb_cancel_transfer(struct libusb_transfer *uxfer)
return (LIBUSB_ERROR_INVALID_PARAM);
 
/* check if not initialised */
-   if (uxfer->dev_handle == NULL)
+   if ((devh = uxfer->dev_handle) == NULL)
return (LIBUSB_ERROR_NOT_FOUND);
 
endpoint = uxfer->endpoint;
 
-   dev = libusb_get_device(uxfer->dev_handle);
+   dev = libusb_get_device(devh);
 
DPRINTF(dev->ctx, LIBUSB_DEBUG_FUNCTION, "libusb_cancel_transfer 
enter");
 
@@ -1513,8 +1514,8 @@ libusb_cancel_transfer(st

svn commit: r338620 - in head: bin/rm bin/rm/tests etc/mtree

2018-09-12 Thread Ed Maste
Author: emaste
Date: Wed Sep 12 19:41:16 2018
New Revision: 338620
URL: https://svnweb.freebsd.org/changeset/base/338620

Log:
  Fix unlink(1) for files starting with -
  
  Restore the original behavior of unlink(1), passing the provided filename
  directly to unlink(2), handling the first argument being "--" correctly.
  
  This fixes "unlink -foo", broken in r97533.
  
  PR:   228448
  Submitted by: Brennan Vincent  (original version)
  Submitted by: Yuri Pankov
  Reported by:  Brennan Vincent 
  Reviewed by:  emaste, kevans, vangyzen, 0mp
  Approved by:  re (delphij)
  Differential Revision: https://reviews.freebsd.org/D17132

Added:
  head/bin/rm/tests/
  head/bin/rm/tests/Makefile   (contents, props changed)
  head/bin/rm/tests/Makefile.depend   (contents, props changed)
  head/bin/rm/tests/rm_test.sh   (contents, props changed)
Modified:
  head/bin/rm/Makefile
  head/bin/rm/rm.1
  head/bin/rm/rm.c
  head/etc/mtree/BSD.tests.dist

Modified: head/bin/rm/Makefile
==
--- head/bin/rm/MakefileWed Sep 12 19:15:58 2018(r338619)
+++ head/bin/rm/MakefileWed Sep 12 19:41:16 2018(r338620)
@@ -1,10 +1,15 @@
 #  @(#)Makefile8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
+.include 
+
 PACKAGE=runtime
 PROG=  rm
 
 LINKS= ${BINDIR}/rm ${BINDIR}/unlink
 MLINKS=rm.1 unlink.1
+
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
 
 .include 

Modified: head/bin/rm/rm.1
==
--- head/bin/rm/rm.1Wed Sep 12 19:15:58 2018(r338619)
+++ head/bin/rm/rm.1Wed Sep 12 19:41:16 2018(r338620)
@@ -32,7 +32,7 @@
 .\"@(#)rm.18.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd November 7, 2015
+.Dd September 12, 2018
 .Dt RM 1
 .Os
 .Sh NAME
@@ -45,6 +45,7 @@
 .Op Fl dIPRrvWx
 .Ar
 .Nm unlink
+.Op Fl -
 .Ar file
 .Sh DESCRIPTION
 The
@@ -154,6 +155,9 @@ No options may be supplied in this simple mode of oper
 which performs an
 .Xr unlink 2
 operation on the passed argument.
+However, the usual option-end delimiter,
+.Fl - ,
+may optionally precede the argument.
 .Sh EXIT STATUS
 The
 .Nm
@@ -201,11 +205,12 @@ directory hierarchy:
 .Pp
 .Dl $ rm -rf foobar
 .Pp
-Either of these commands will remove the file
+Any of these commands will remove the file
 .Pa -f :
 .Bd -literal -offset indent
 $ rm -- -f
 $ rm ./-f
+$ unlink -f
 .Ed
 .Sh COMPATIBILITY
 The

Modified: head/bin/rm/rm.c
==
--- head/bin/rm/rm.cWed Sep 12 19:15:58 2018(r338619)
+++ head/bin/rm/rm.cWed Sep 12 19:41:16 2018(r338620)
@@ -101,13 +101,12 @@ main(int argc, char *argv[])
else
++p;
if (strcmp(p, "unlink") == 0) {
-   while (getopt(argc, argv, "") != -1)
+   if (argc == 2)
+   rm_file(&argv[1]);
+   else if (argc == 3 && strcmp(argv[1], "--") == 0)
+   rm_file(&argv[2]);
+   else
usage();
-   argc -= optind;
-   argv += optind;
-   if (argc != 1)
-   usage();
-   rm_file(&argv[0]);
exit(eval);
}
 
@@ -634,7 +633,7 @@ usage(void)
 
(void)fprintf(stderr, "%s\n%s\n",
"usage: rm [-f | -i] [-dIPRrvWx] file ...",
-   "   unlink file");
+   "   unlink [--] file");
exit(EX_USAGE);
 }
 

Added: head/bin/rm/tests/Makefile
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/bin/rm/tests/Makefile  Wed Sep 12 19:41:16 2018(r338620)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+ATF_TESTS_SH+=  rm_test
+
+.include 

Added: head/bin/rm/tests/Makefile.depend
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/bin/rm/tests/Makefile.depend   Wed Sep 12 19:41:16 2018
(r338620)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include 
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

Added: head/bin/rm/tests/rm_test.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/bin/rm/tests/rm_test.shWed Sep 12 19:41:16 2018
(r338620)
@@ -0,0 +1,45 @@
+#
+# Copyright 2018 Yuri Pankov
+#
+# 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 

svn commit: r338621 - in head: etc etc/pam.d lib/libpam lib/libpam/pam.d

2018-09-12 Thread Brad Davis
Author: brd
Date: Thu Sep 13 04:08:48 2018
New Revision: 338621
URL: https://svnweb.freebsd.org/changeset/base/338621

Log:
  Move all pam related config to lib/libpam/
  
  Approved by:  re (rgrimes), will (mentor), des
  Differential Revision:https://reviews.freebsd.org/D17122

Added:
  head/lib/libpam/pam.d/
 - copied from r338620, head/etc/pam.d/
Deleted:
  head/etc/pam.d/
Modified:
  head/etc/Makefile
  head/lib/libpam/Makefile
  head/lib/libpam/pam.d/Makefile

Modified: head/etc/Makefile
==
--- head/etc/Makefile   Wed Sep 12 19:41:16 2018(r338620)
+++ head/etc/Makefile   Thu Sep 13 04:08:48 2018(r338621)
@@ -121,7 +121,6 @@ distribution:
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
-   ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
 .if ${MK_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \

Modified: head/lib/libpam/Makefile
==
--- head/lib/libpam/MakefileWed Sep 12 19:41:16 2018(r338620)
+++ head/lib/libpam/MakefileThu Sep 13 04:08:48 2018(r338621)
@@ -25,7 +25,7 @@
 # $FreeBSD$
 
 # The modules link in libpam.  They build the static modules as well.
-SUBDIR+=   libpam modules
+SUBDIR+=   libpam modules pam.d
 SUBDIR_DEPEND_modules= libpam
 SUBDIR+=   static_libpam
 SUBDIR_DEPEND_static_libpam= modules

Modified: head/lib/libpam/pam.d/Makefile
==
--- head/etc/pam.d/Makefile Wed Sep 12 19:41:16 2018(r338620)
+++ head/lib/libpam/pam.d/Makefile  Thu Sep 13 04:08:48 2018
(r338621)
@@ -4,9 +4,8 @@
 
 NO_OBJ=
 
-FILESGROUPS=   FILES
-
-FILES= README \
+CONFGROUPS=CONFS
+CONFS= README \
cron \
imap \
login \
@@ -15,34 +14,26 @@ FILES=  README \
sshd su system \
xdm
 
-FILESDIR=  /etc/pam.d
-FILESMODE= 644
+CONFDIR=   /etc/pam.d
+CONFSMODE_README=  444
 
 .if ${MK_AT} != "no"
-FILESGROUPS+=  AT
+CONFGROUPS+=   AT
 AT+=   atrun
 ATPACKAGE+=at
-ATDIR= ${FILESDIR}
-ATMODE=${FILESMODE}
 .endif
 
 .if ${MK_FTP} != "no"
-FILESGROUPS+=  FTP
+CONFGROUPS+=   FTP
 FTP+=  ftpd
 FTPPACKAGE+=   ftp
-FTPDIR=${FILESDIR}
-FTPMODE=   ${FILESMODE}
 LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp
 .endif
 
 .if ${MK_TELNET} != "no"
-FILESGROUPS+=  TELNET
+CONFGROUPS+=   TELNET
 TELNET+=   telnetd
 TELNETPACKAGE+=telnet
-TELNETDIR= ${FILESDIR}
-TELNETMODE=${FILESMODE}
 .endif
-
-FILESMODE_README=  444
 
 .include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"


Re: svn commit: r338621 - in head: etc etc/pam.d lib/libpam lib/libpam/pam.d

2018-09-12 Thread Brad Davis
On Wed, Sep 12, 2018, at 10:08 PM, Brad Davis wrote:
> Author: brd
> Date: Thu Sep 13 04:08:48 2018
> New Revision: 338621
> URL: https://svnweb.freebsd.org/changeset/base/338621
> 
> Log:
>   Move all pam related config to lib/libpam/
>   
>   Approved by:re (rgrimes), will (mentor), des
>   Differential Revision:  https://reviews.freebsd.org/D17122
> 
> Added:
>   head/lib/libpam/pam.d/
>  - copied from r338620, head/etc/pam.d/
> Deleted:
>   head/etc/pam.d/
> Modified:
>   head/etc/Makefile
>   head/lib/libpam/Makefile
>   head/lib/libpam/pam.d/Makefile
> 
> Modified: head/etc/Makefile
> ==
> --- head/etc/Makefile Wed Sep 12 19:41:16 2018(r338620)
> +++ head/etc/Makefile Thu Sep 13 04:08:48 2018(r338621)
> @@ -121,7 +121,6 @@ distribution:
>   ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
>   ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
>   ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
> - ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
>  .if ${MK_UNBOUND} != "no"
>   if [ ! -e ${DESTDIR}/etc/unbound ]; then \
>   ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
> 
> Modified: head/lib/libpam/Makefile
> ==
> --- head/lib/libpam/Makefile  Wed Sep 12 19:41:16 2018(r338620)
> +++ head/lib/libpam/Makefile  Thu Sep 13 04:08:48 2018(r338621)
> @@ -25,7 +25,7 @@
>  # $FreeBSD$
>  
>  # The modules link in libpam.  They build the static modules as well.
> -SUBDIR+= libpam modules
> +SUBDIR+= libpam modules pam.d
>  SUBDIR_DEPEND_modules=   libpam
>  SUBDIR+= static_libpam
>  SUBDIR_DEPEND_static_libpam= modules
> 
> Modified: head/lib/libpam/pam.d/Makefile
> ==
> --- head/etc/pam.d/Makefile   Wed Sep 12 19:41:16 2018(r338620)
> +++ head/lib/libpam/pam.d/MakefileThu Sep 13 04:08:48 2018
> (r338621)
> @@ -4,9 +4,8 @@
>  
>  NO_OBJ=
>  
> -FILESGROUPS= FILES
> -
> -FILES=   README \
> +CONFGROUPS=  CONFS
> +CONFS=   README \
>   cron \
>   imap \
>   login \
> @@ -15,34 +14,26 @@ FILES=README \
>   sshd su system \
>   xdm
>  
> -FILESDIR=/etc/pam.d
> -FILESMODE=   644
> +CONFDIR= /etc/pam.d
> +CONFSMODE_README=444
>  
>  .if ${MK_AT} != "no"
> -FILESGROUPS+=AT
> +CONFGROUPS+= AT
>  AT+= atrun
>  ATPACKAGE+=  at
> -ATDIR=   ${FILESDIR}
> -ATMODE=  ${FILESMODE}
>  .endif
>  
>  .if ${MK_FTP} != "no"
> -FILESGROUPS+=FTP
> +CONFGROUPS+= FTP
>  FTP+=ftpd
>  FTPPACKAGE+= ftp
> -FTPDIR=  ${FILESDIR}
> -FTPMODE= ${FILESMODE}
>  LINKS=   ${FILESDIR}/ftpd ${FILESDIR}/ftp

^^^ this is broken durning install,  I have a patch out to re@.  Sorry for the 
breakage.


Regards,
Brad Davis
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"