Re: CVS commit: src/sys/external/bsd/acpica/dist

2020-08-03 Thread Herbert J. Skuhra
On Mon, Aug 03, 2020 at 02:31:11PM -0700, Tom Spindler (moof) wrote:
> On Mon, Aug 03, 2020 at 10:59:04PM +0200, Herbert J. Skuhra wrote:
> > This breaks the build (amd64) on FreeBSD and GNU/Linux:
> > 
> > aslcompilerlex.l: In function 'AslCompilerlex':
> > aslcompilerlex.l:589:22: error: 'PARSEOP_REGIONSPACE_PRM' undeclared (first 
> > use in this function); did you mean 'PARSEOP_REGIONSPACE_PCC'?
> >  "FFixedHW"  { count (0); return 
> > (PARSEOP_REGIONSPACE_FFIXEDHW); }
> >   ^~~
> >   PARSEOP_REGIONSPACE_PCC
> > aslcompilerlex.l:589:22: note: each undeclared identifier is reported only 
> > once for each function it appears in
> > *** [aslcompilerlex.o] Error code 1
> 
> It failed for me in the same way on NetBSD until I cleared out my
> /src/external/bsd/acpica/ obj directory; try that.

Yes, false alarm. Sorry!
I was sure I had already tried that.

Thanks.

-- 
Herbert


Re: CVS commit: src/sys/external/bsd/acpica/dist

2020-08-03 Thread Herbert J. Skuhra
On Sun, 02 Aug 2020 22:25:55 +0200, "Christos Zoulas" wrote:
> 
> Module Name:  src
> Committed By: christos
> Date: Sun Aug  2 20:25:55 UTC 2020
> 
> Modified Files:
>   src/sys/external/bsd/acpica/dist/compiler: aslcompiler.l aslerror.c
>   aslload.c aslxref.c
>   src/sys/external/bsd/acpica/dist/debugger: dbdisply.c
>   src/sys/external/bsd/acpica/dist/include: acpixf.h actypes.h
>   src/sys/external/bsd/acpica/dist/os_specific/service_layers:
>   oslinuxtbl.c
>   src/sys/external/bsd/acpica/dist/utilities: utdecode.c utdelete.c
> Removed Files:
>   src/sys/external/bsd/acpica/dist/generate/unix/acpinames: Makefile
>   src/sys/external/bsd/acpica/dist/tools/acpinames: acpinames.h anmain.c
>   anstubs.c antables.c
> 
> Log Message:
> merge conflicts

This breaks the build (amd64) on FreeBSD and GNU/Linux:

aslcompilerlex.l: In function 'AslCompilerlex':
aslcompilerlex.l:589:22: error: 'PARSEOP_REGIONSPACE_PRM' undeclared (first use 
in this function); did you mean 'PARSEOP_REGIONSPACE_PCC'?
 "FFixedHW"  { count (0); return 
(PARSEOP_REGIONSPACE_FFIXEDHW); }
  ^~~
  PARSEOP_REGIONSPACE_PCC
aslcompilerlex.l:589:22: note: each undeclared identifier is reported only once 
for each function it appears in
*** [aslcompilerlex.o] Error code 1

--
Herbert


Re: CVS commit: src/sys/dev/fdt

2019-11-23 Thread Herbert J. Skuhra
On Sat, 23 Nov 2019 19:53:05 +0100, "Jared D. McNeill" wrote:
> 
> Module Name:  src
> Committed By: jmcneill
> Date: Sat Nov 23 18:53:05 UTC 2019
> 
> Modified Files:
>   src/sys/dev/fdt: fdt_port.c
> 
> Log Message:
> Use fdtbus_get_reg to read "reg" property

Hi,

this change breaks the build (of earmv7hf) on FreeBSD:

/usr/home/herbert/source/netbsd/current/src/sys/dev/fdt/fdt_port.c: In function 
'fdt_ports_register':
/usr/home/herbert/source/netbsd/current/src/sys/dev/fdt/fdt_port.c:299:32: 
error: passing argument 3 of
 'fdtbus_get_reg' from incompatible pointer type 
[-Werror=incompatible-pointer-types]
if (fdtbus_get_reg(child, 0, &id, NULL) != 0) {
^~~
In file included from 
/usr/home/herbert/source/netbsd/current/src/sys/dev/fdt/fdt_port.c:49:
/usr/home/herbert/source/netbsd/current/src/sys/dev/fdt/fdtvar.h:303:33: note: 
expected 'bus_addr_t *'
{aka 'long unsigned int *'} but argument is of type 'uint64_t *' {aka 'long 
long unsigned int *'}
 int  fdtbus_get_reg(int, u_int, bus_addr_t *, bus_size_t *);
  ^~~~

--
Herbert


Re: CVS import: src/external/bsd/dhcpcd/dist

2019-10-14 Thread Herbert J. Skuhra
On Fri, 11 Oct 2019 13:01:23 +0200, "Roy Marples" wrote:
> 
> Module Name:  src
> Committed By: roy
> Date: Fri Oct 11 11:01:23 UTC 2019
> 
> Update of /cvsroot/src/external/bsd/dhcpcd/dist
> In directory ivanova.netbsd.org:/tmp/cvs-serv19794
> 
> Log Message:
> Import dhcpcd-8.1.0 with the following changes:
> 
>  * Fix carrier status after a route socket overflow
>  * Allow domain spaced options
>  * DHCP: Allow not sending Force Renew Nonce or Reconf Accept
>  * IPv4LL: Now passes Apple Bonjour test versions 1.4 and 1.5
>  * ARP: Fix a typo and remove pragma (thus working with old gcc)
>  * DHCP6: Fix a cosmetic issue with infinite leases
>  * DHCP6: SLA 0 and Prefix Len 0 will now add a delegatd /64 address
>  * Ignore some virtual interfaces such as Tap and Bridge by default
>  * BPF: Move validation logic out of BPF and back into dhcpcd 

Hi,

this obviously breaks DHCP on my Raspberry PI 2B (earmv7hf).
I've also checked daily snapshots:

201910102350Z OK
201910111300Z not OK usmsc0 169.254.x.x/16

--
Herbert


Re: CVS commit: src/tools

2019-05-07 Thread Herbert J. Skuhra
On Tue, 07 May 2019 12:23:12 +0200, "J. Hannken-Illjes" wrote:
> 
> 
> > On 7. May 2019, at 12:17, matthew green  wrote:
> > 
> >> Diff is NOT reversed.
> > 
> > ah yes, i see.  please commit.

Crossbuilding is still broken.

On FreeBSD 12.0-STABLE (amd64) and Arch GNU/Linux building earmv7hf and amd64 I 
get:

#   compile  libprop/prop_dictionary.lo
cc -O   -I/usr/home/herbert/source/netbsd/src/tools/libprop/../compat 
-I/usr/home/herbert/source/netbsd/src/tools/libprop/../../common/include 
-I/usr/home/herbert/source/netbsd/src/../build/earmv7hf/tools/include/nbinclude 
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64  
-I/usr/home/herbert/source/netbsd/src/../build/earmv7hf/tools/include 
-I/usr/home/herbert/source/netbsd/src/../build/earmv7hf/tools/include/nbinclude 
-c -o prop_dictionary.lo.o
/usr/home/herbert/source/netbsd/src/tools/libprop/../../common/lib/libprop/prop_dictionary.c

/usr/home/herbert/source/netbsd/src/tools/libprop/../../common/lib/libprop/prop_dictionary.c:37:10:
 fatal error: 'sys/rbtree.h' file not found 
#include  
   
 ^~ 
   
1 error generated.  
   

*** Failed target:  prop_dictionary.lo
*** Failed command: cc -O 
-I/usr/home/herbert/source/netbsd/src/tools/libprop/../compat 
-I/usr/home/herbert/source/netbsd/src/tools/libprop/../../common/include 
-I/usr/home/herbert/source/netbsd/src/../build/earmv7hf/tools/include/nbinclude 
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 
-I/usr/home/herbert/source/netbsd/src/../build/earmv7hf/tools/include 
-I/usr/home/herbert/source/netbsd/src/../build/earmv7hf/tools/include/nbinclude 
-c -o prop_dictionary.lo.o 
/usr/home/herbert/source/netbsd/src/tools/libprop/../../common/lib/libprop/prop_dictionary.c
 
*** Error code 1

Stop.

-- 
Herbert


Re: CVS commit: src/distrib/sets/lists

2018-11-11 Thread Herbert J. Skuhra
On Sun, 11 Nov 2018 13:03:08 +0100, "Maxime Villard" wrote:
> 
> Module Name:  src
> Committed By: maxv
> Date: Sun Nov 11 12:03:08 UTC 2018
> 
> Modified Files:
>   src/distrib/sets/lists/base: md.amd64
>   src/distrib/sets/lists/comp: md.amd64
>   src/distrib/sets/lists/debug: md.amd64
> 
> Log Message:
> Fix the libnvmm sets, do the same as libx86_64.

I still get:

===  9 extra files in DESTDIR  =
Files in DESTDIR but missing from flist.
File is obsolete or flist is out of date ?
--
./lib/libnvmm.so
./lib/libnvmm.so.0
./lib/libnvmm.so.0.1
./usr/lib/i386/libnvmm.a
./usr/lib/i386/libnvmm.so
./usr/lib/i386/libnvmm.so.0
./usr/lib/i386/libnvmm.so.0.1
./usr/lib/i386/libnvmm_p.a
./usr/lib/i386/libnvmm_pic.a
=  end of 9 extra files  ===

I am building on FreeBSD 12.0-BETA4 (amd64):

./build.sh -j4 -a x86_64 -m amd64 -T ../tools -O ../obj -U distribution

-- 
Herbert


Re: CVS commit: src/etc/etc.evbarm

2018-11-10 Thread Herbert J. Skuhra
On Tue, 06 Nov 2018 14:36:06 +0100, "Herbert J. Skuhra" wrote:
> 
> On Mon, 05 Nov 2018 22:37:31 +0100, Nick Hudson wrote:
> > 
> > On 05/11/2018 20:45, Herbert J. Skuhra wrote:
> > > On Mon, Nov 05, 2018 at 09:11:02AM -0500, Greg Troxel wrote:
> > >> "Herbert J. Skuhra"  writes:
> > >> 
> > >>> On Sun, 04 Nov 2018 22:41:12 +0100, "Nick Hudson" wrote:
> > >>>> 
> > >>>> Module Name:   src
> > >>>> Committed By:  skrll
> > >>>> Date:  Sun Nov  4 21:41:12 UTC 2018
> > >>>> 
> > >>>> Modified Files:
> > >>>>src/etc/etc.evbarm: Makefile.inc
> > >>>> 
> > >>>> Log Message:
> > >>>> Only add GENERIC to earmv6 and earmv7 builds
> > >>> 
> > >>> This change obviously breaks "./build.sh -m evbarm -a earmv7hf -U 
> > >>> release".
> > 
> > fixed. (I hope)
> > 
> > > My Raspberry boots, grows /, reboots and then panics. This happens for
> > > several days now. :-(
> > 
> > What's the panic message and backtrace?
> 
> [  13.5062763] Fatal kernel mode prefetch abort at 0x
> [  13.5062763] trapframe: 0xb9b45ef0, spsr=a0090013
> [  13.5062763] r0 =742871c8, r1 =f2a00e00, r2 =b9b45fb0, r3 =0010
> [  13.5062763] r4 =80799648, r5 =, r6 =b9b45fb0, r7 =742871c8
> [  13.5062763] r8 =0010, r9 =f2a00e00, r10=ba87a920, r11=b9b45fac
> [  13.5062763] r12=b9b45f40, ssp=b9b45f40, slr=80023890, pc =
> 
> Stopped in pid 191.1 (syslogd) at   0:  address 0x0 is invalid
> andeq   r0, r0, r0
> db{2}> bt
> 0xb9b45fac: netbsd:undefinedinstruction+0xc
> 
> If I disable syslogd I get a similar error with makemandb.

earmv6hf works fine!

--
Herbert


Re: CVS commit: src/etc/etc.evbarm

2018-11-06 Thread Herbert J. Skuhra
On Mon, 05 Nov 2018 22:37:31 +0100, Nick Hudson wrote:
> 
> On 05/11/2018 20:45, Herbert J. Skuhra wrote:
> > On Mon, Nov 05, 2018 at 09:11:02AM -0500, Greg Troxel wrote:
> >> "Herbert J. Skuhra"  writes:
> >> 
> >>> On Sun, 04 Nov 2018 22:41:12 +0100, "Nick Hudson" wrote:
> >>>> 
> >>>> Module Name: src
> >>>> Committed By:skrll
> >>>> Date:Sun Nov  4 21:41:12 UTC 2018
> >>>> 
> >>>> Modified Files:
> >>>>  src/etc/etc.evbarm: Makefile.inc
> >>>> 
> >>>> Log Message:
> >>>> Only add GENERIC to earmv6 and earmv7 builds
> >>> 
> >>> This change obviously breaks "./build.sh -m evbarm -a earmv7hf -U 
> >>> release".
> 
> fixed. (I hope)
> 
> > My Raspberry boots, grows /, reboots and then panics. This happens for
> > several days now. :-(
> 
> What's the panic message and backtrace?

[  13.5062763] Fatal kernel mode prefetch abort at 0x
[  13.5062763] trapframe: 0xb9b45ef0, spsr=a0090013
[  13.5062763] r0 =742871c8, r1 =f2a00e00, r2 =b9b45fb0, r3 =0010
[  13.5062763] r4 =80799648, r5 =, r6 =b9b45fb0, r7 =742871c8
[  13.5062763] r8 =0010, r9 =f2a00e00, r10=ba87a920, r11=b9b45fac
[  13.5062763] r12=b9b45f40, ssp=b9b45f40, slr=80023890, pc =

Stopped in pid 191.1 (syslogd) at   0:  address 0x0 is invalid
andeq   r0, r0, r0
db{2}> bt
0xb9b45fac: netbsd:undefinedinstruction+0xc

If I disable syslogd I get a similar error with makemandb.

--
Herbert


Re: CVS commit: src/etc/etc.evbarm

2018-11-05 Thread Herbert J. Skuhra
On Tue, Nov 06, 2018 at 12:58:54AM +, m...@netbsd.org wrote:
> On Mon, Nov 05, 2018 at 09:45:38PM +0100, Herbert J. Skuhra wrote:
> > With etc/etc.evbarm/Makefile.inc r1.97 the command completes. I only
> > have to fix the build of groff (PR #53314) by removing/commenting out
> > the following lines in obj/tools/groff/build/src/include/config.h:
> > 
> > #define NEED_DECLARATION_GETTIMEOFDAY 1
> > #define NEED_DECLARATION_PUTENV 1
> > #define NEED_DECLARATION_SRAND 1
> > #define NEED_DECLARATION_STRNCASECMP 1
> 
> on -8 its fixed it with
> https://releng.netbsd.org/cgi-bin/req-8.cgi?show=1070

Adding HOST_CXXFLAGS to tools/Makefile.gnuhost fixes the issue:

--- tools/Makefile.gnuhost  22 Oct 2018 13:19:42 -  1.51
+++ tools/Makefile.gnuhost  6 Nov 2018 07:14:01 -
@@ -22,6 +22,7 @@
 HOST_COMPILER_CLANG!= if ${HOST_CC} --version | grep -q -s clang; then echo 
yes; else echo no; fi
 .if ${HOST_COMPILER_CLANG} == "yes"
 HOST_CFLAGS+=-O2 -no-cpp-precomp
+HOST_CXXFLAGS+=-std=gnu++03
 .endif
 
 MAKE_PROGRAM?= ${MAKE}



Thanks.

-- 
Herbert 


Re: CVS commit: src/etc/etc.evbarm

2018-11-05 Thread Herbert J. Skuhra
On Mon, Nov 05, 2018 at 09:37:31PM +, Nick Hudson wrote:
> On 05/11/2018 20:45, Herbert J. Skuhra wrote:
> > On Mon, Nov 05, 2018 at 09:11:02AM -0500, Greg Troxel wrote:
> > > "Herbert J. Skuhra"  writes:
> > > 
> > > > On Sun, 04 Nov 2018 22:41:12 +0100, "Nick Hudson" wrote:
> > > > > 
> > > > > Module Name:  src
> > > > > Committed By: skrll
> > > > > Date: Sun Nov  4 21:41:12 UTC 2018
> > > > > 
> > > > > Modified Files:
> > > > >   src/etc/etc.evbarm: Makefile.inc
> > > > > 
> > > > > Log Message:
> > > > > Only add GENERIC to earmv6 and earmv7 builds
> > > > 
> > > > This change obviously breaks "./build.sh -m evbarm -a earmv7hf -U 
> > > > release".
> 
> fixed. (I hope)

Yes, the build completes again.

> > My Raspberry boots, grows /, reboots and then panics. This happens for
> > several days now. :-(
> 
> What's the panic message and backtrace?

I have to take a screenshot or transcribe it. I'll post this information
later today.

Thanks.

-- 
Herbert


Re: CVS commit: src/etc/etc.evbarm

2018-11-05 Thread Herbert J. Skuhra
On Mon, Nov 05, 2018 at 09:11:02AM -0500, Greg Troxel wrote:
> "Herbert J. Skuhra"  writes:
> 
> > On Sun, 04 Nov 2018 22:41:12 +0100, "Nick Hudson" wrote:
> >> 
> >> Module Name:   src
> >> Committed By:  skrll
> >> Date:  Sun Nov  4 21:41:12 UTC 2018
> >> 
> >> Modified Files:
> >>src/etc/etc.evbarm: Makefile.inc
> >> 
> >> Log Message:
> >> Only add GENERIC to earmv6 and earmv7 builds
> >
> > This change obviously breaks "./build.sh -m evbarm -a earmv7hf -U release".
> 
> That seems like an unusual invocation.   Do you really mean it that way,
> instead of -a evbarm?   Passing earmv7hf to -a is an alias which sets
> both a amd m, and then the line is also setting m.Why do you include
> '-m evbarm' - what cpu type are you trying to build for?

I am trying to build an image for my Raspberry Pi 2B on FreeBSD
12.0-BETA3 and I am just following the instructions from
<https://wiki.netbsd.org/ports/evbarm/raspberry_pi/>:


CPU types

Raspberry Pi 1 uses "earmv6hf".
Raspberry Pi 2 uses "earmv7hf".
Raspberry Pi 3 uses "earmv7hf".

Building yourself

Getting sources and building a release with build.sh is not special for
evbarm. Pick a CPU type alias and pass it to build.sh with -m. Examples
(the first two are equivalent):

./build.sh -m earmv6hf -u release
./build.sh -m evbarm -a earmv6hf -u release
./build.sh -m evbarm -a earmv7hf -u release
 

With etc/etc.evbarm/Makefile.inc r1.97 the command completes. I only
have to fix the build of groff (PR #53314) by removing/commenting out
the following lines in obj/tools/groff/build/src/include/config.h:

#define NEED_DECLARATION_GETTIMEOFDAY 1
#define NEED_DECLARATION_PUTENV 1
#define NEED_DECLARATION_SRAND 1
#define NEED_DECLARATION_STRNCASECMP 1

My Raspberry boots, grows /, reboots and then panics. This happens for
several days now. :-(

-- 
Herbert


Re: CVS commit: src/etc/etc.evbarm

2018-11-05 Thread Herbert J. Skuhra
On Sun, 04 Nov 2018 22:41:12 +0100, "Nick Hudson" wrote:
> 
> Module Name:  src
> Committed By: skrll
> Date: Sun Nov  4 21:41:12 UTC 2018
> 
> Modified Files:
>   src/etc/etc.evbarm: Makefile.inc
> 
> Log Message:
> Only add GENERIC to earmv6 and earmv7 builds

This change obviously breaks "./build.sh -m evbarm -a earmv7hf -U release".

mv: rename /tmp/mkimage.zyfOkH/mnt/boot/sun50i-* to 
/tmp/mkimage.zyfOkH/mnt/boot/allwinner/sun50i-*: No such file or directory  
   

*** Failed target:  smp_armv7

--
Herbert


Re: CVS commit: src/crypto/external/bsd/openssh/dist

2017-04-19 Thread Herbert J. Skuhra
Christos Zoulas skrev:
> 
> Module Name:  src
> Committed By: christos
> Date: Tue Apr 18 18:41:46 UTC 2017
> 
> Modified Files:
>   src/crypto/external/bsd/openssh/dist: addrmatch.c atomicio.c atomicio.h
>   auth-bsdauth.c auth-krb5.c auth-options.c auth-options.h auth-pam.c
>   auth-pam.h auth-passwd.c auth-rhosts.c auth-skey.c auth.c auth.h
>   auth2-chall.c auth2-gss.c auth2-hostbased.c auth2-kbdint.c
>   auth2-krb5.c auth2-none.c auth2-passwd.c auth2-pubkey.c auth2.c
>   authfd.c authfd.h authfile.c authfile.h bcrypt_pbkdf.c bitmap.c
>   bitmap.h blocks.c blowfish.c bufaux.c bufbn.c bufec.c buffer.c
>   buffer.h canohost.c canohost.h chacha.c channels.c channels.h
>   cipher-3des1.c cipher-bf1.c cipher-chachapoly.c cipher-ctr-mt.c
>   cipher.c cipher.h cleanup.c clientloop.c clientloop.h compat.c
>   compat.h crc32.c crc32.h deattack.c deattack.h dh.c dh.h
>   digest-libc.c digest-openssl.c dispatch.c dispatch.h dns.c dns.h
>   ed25519.c fatal.c fe25519.c fmt_scaled.c fmt_scaled.h ge25519.c
>   getpeereid.c getpeereid.h getrrsetbyname.c getrrsetbyname.h
>   groupaccess.c groupaccess.h gss-genr.c gss-serv-krb5.c gss-serv.c
>   hash.c hmac.c hostfile.c hostfile.h includes.h kex.c kex.h
>   kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c
>   kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c key.c
>   key.h krl.c ldapauth.c ldapauth.h log.c log.h mac.c mac.h match.c
>   match.h md-sha256.c misc.c misc.h moduli.5 moduli.c monitor.c
>   monitor.h monitor_fdpass.c monitor_fdpass.h monitor_wrap.c
>   monitor_wrap.h msg.c msg.h mux.c myproposal.h namespace.h nchan.c
>   opacket.c opacket.h packet.c packet.h pathnames.h pkcs11.h
>   poly1305.c progressmeter.c progressmeter.h random.h readconf.c
>   readconf.h readpass.c readpassphrase.3 readpassphrase.c
>   readpassphrase.h rsa.c rsa.h sandbox-rlimit.c sc25519.c scp.1 scp.c
>   servconf.c servconf.h serverloop.c serverloop.h session.c session.h
>   sftp-client.c sftp-client.h sftp-common.c sftp-common.h sftp-glob.c
>   sftp-server-main.c sftp-server.8 sftp-server.c sftp.1 sftp.c sftp.h
>   smult_curve25519_ref.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c
>   ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-gss.h ssh-keygen.1
>   ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8
>   ssh-keysign.c ssh-pkcs11-client.c ssh-pkcs11-helper.8
>   ssh-pkcs11-helper.c ssh-pkcs11.c ssh-pkcs11.h ssh-rsa.c ssh.1 ssh.c
>   ssh.h ssh1.h ssh2.h ssh_api.c ssh_api.h ssh_config.5
>   sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
>   sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.8 sshd.c
>   sshd_config sshd_config.5 ssherr.c sshkey.c sshkey.h sshlogin.c
>   sshlogin.h sshpty.c sshpty.h sshtty.c ttymodes.c ttymodes.h
>   uidswap.c uidswap.h umac.c umac.h utf8.c uuencode.c uuencode.h
>   verify.c version.h xmalloc.c xmalloc.h
> 
> Log Message:
> merge conflicts

I think something went wrong with merging
crypto/external/bsd/openssh/dist/sshd_config.

r1.20 contains weird lines:

Index: sshd_config
===
RCS file: /cvsroot/src/crypto/external/bsd/openssh/dist/sshd_config,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sshd_config 1 Feb 2017 14:27:37 -   1.19
+++ sshd_config 18 Apr 2017 18:41:46 -  1.20
@@ -1,5 +1,5 @@
-#  $NetBSD: sshd_config,v 1.19 2017/02/01 14:27:37 christos Exp $
-#  $OpenBSD: sshd_config,v 1.100 2016/08/15 12:32:04 naddy Exp $
+#  $NetBSD: sshd_config,v 1.20 2017/04/18 18:41:46 christos Exp $
+#  $OpenBSD: sshd_config,v 1.101 2017/03/14 07:19:07 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -74,8 +74,11 @@
 #PrintLastLog yes
 #TCPKeepAlive yes
 #UseLogin no
+<<< sshd_config
 #UsePrivilegeSeparation sandbox
 UsePam yes
+===
+>>> 1.1.1.15
 #PermitUserEnvironment no
 #Compression delayed
 #ClientAliveInterval 0

Thanks.

--
Herbert


Re: CVS commit: src/tests/usr.bin/netpgpverify

2012-11-27 Thread Herbert J. Skuhra

On 27.11.2012 11:23, Herbert J. Skuhra wrote:

On 20.11.2012 08:55, Alistair G. Crooks wrote:

Module Name:src
Committed By:   agc
Date:   Tue Nov 20 07:55:55 UTC 2012

Added Files:
src/tests/usr.bin/netpgpverify: Atffile Makefile t_netpgpverify.sh

Log Message:
Add tests for netpgpverify.


After this commit the following command fails:

% ./build.sh -O ../obj -T ../tools -U distribution
[...]
rm: Atffile: Permission denied
Failed to remove the following files from
/usr/src/tests/usr.bin/netpgpverify:
Atffile
[...]
*** Error code 1

Stop.
nbmake: stopped in /usr/src

ERROR: Failed to make distribution
*** BUILD ABORTED ***


OK, the below patch helps:

--- tests/usr.bin/netpgpverify/Makefile.bak 2012-11-27 
11:38:06.0 +0100
+++ tests/usr.bin/netpgpverify/Makefile 2012-11-27 11:38:19.0 
+0100

@@ -6,4 +6,6 @@

 TESTS_SH+= t_netpgpverify

+ATFFILE= no
+
 .include 

--
Herbert


Re: CVS commit: src/tests/usr.bin/netpgpverify

2012-11-27 Thread Herbert J. Skuhra

On 20.11.2012 08:55, Alistair G. Crooks wrote:

Module Name:src
Committed By:   agc
Date:   Tue Nov 20 07:55:55 UTC 2012

Added Files:
src/tests/usr.bin/netpgpverify: Atffile Makefile t_netpgpverify.sh

Log Message:
Add tests for netpgpverify.


After this commit the following command fails:

% ./build.sh -O ../obj -T ../tools -U distribution
[...]
rm: Atffile: Permission denied
Failed to remove the following files from 
/usr/src/tests/usr.bin/netpgpverify:

Atffile
[...]
*** Error code 1

Stop.
nbmake: stopped in /usr/src

ERROR: Failed to make distribution
*** BUILD ABORTED ***

--
Herbert



Re: CVS commit: [netbsd-6] src/usr.bin/login

2012-05-08 Thread Herbert J. Skuhra
On Mon, May 7, 2012, at 16:24, Jeff Rizzo wrote:
> Module Name:src
> Committed By:   riz
> Date:   Mon May  7 16:24:07 UTC 2012
> 
> Modified Files:
>   src/usr.bin/login [netbsd-6]: Makefile common.c common.h k5login.c
>   login.c login_pam.c
> 
> Log Message:
> Pull up following revision(s) (requested by christos in ticket #215):
>   usr.bin/login/login.c: revision 1.100
>   usr.bin/login/login.c: revision 1.101
>   usr.bin/login/login.c: revision 1.102
>   usr.bin/login/common.c: revision 1.4
>   usr.bin/login/common.h: revision 1.2
>   usr.bin/login/k5login.c: revision 1.28
>   usr.bin/login/k5login.c: revision 1.29
>   usr.bin/login/login.c: revision 1.99
>   usr.bin/login/login_pam.c: revision 1.21

I get the following error:

/usr/src/usr.bin/login/login_pam.c: In function 'main':
/usr/src/usr.bin/login/login_pam.c:243:4: error: implicit declaration of
function 'trimusername'
/usr/src/usr.bin/login/login_pam.c:243:13: error: assignment makes
pointer from integer without a cast

This has been fixed in revision 1.22, right?

-- 
Herbert