CVS commit: src/external/cddl/osnet/dev/dtrace/arm
Module Name:src
Committed By: ozaki-r
Date: Sat Mar 8 11:46:01 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/dtrace/arm: dtrace_isa.c
Log Message:
Prepare dtrace_isa.c for build
- Tidy up header file inclusions
- Replace curcpu with cpu_number()
- Fix argument of dtrace_getreg
- Tweak for gcc 4.8
Note that the file is still not buildable.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.2 src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.3
--- src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c:1.2 Wed Mar 5 02:00:24 2014
+++ src/external/cddl/osnet/dev/dtrace/arm/dtrace_isa.c Sat Mar 8 11:46:01 2014
@@ -30,24 +30,14 @@
#include sys/param.h
#include sys/systm.h
#include sys/kernel.h
-#include sys/stack.h
-#include sys/pcpu.h
#include machine/frame.h
-#include machine/md_var.h
#include machine/reg.h
-#include vm/vm.h
-#include vm/vm_param.h
-#include vm/pmap.h
-
#include machine/db_machdep.h
-#include machine/md_var.h
#include machine/vmparam.h
-#include machine/stack.h
#include ddb/db_sym.h
#include ddb/ddb.h
-#include sys/kdb.h
#include regset.h
@@ -69,9 +59,11 @@ dtrace_getpcstack(pc_t *pcstack, int pcs
uint32_t *intrpc)
{
uint32_t *frame, *lastframe;
+#if 0
int scp_offset;
+#endif
int depth = 0;
- pc_t caller = (pc_t) solaris_cpu[curcpu].cpu_dtrace_caller;
+ pc_t caller = (pc_t) solaris_cpu[cpu_number()].cpu_dtrace_caller;
if (intrpc != 0)
pcstack[depth++] = (pc_t) intrpc;
@@ -80,7 +72,9 @@ dtrace_getpcstack(pc_t *pcstack, int pcs
frame = (uint32_t *)__builtin_frame_address(0);;
lastframe = NULL;
+#if 0
scp_offset = -(get_pc_str_offset() 2);
+#endif
while ((frame != NULL) (depth pcstack_limit)) {
db_addr_t scp;
@@ -178,27 +172,18 @@ int
dtrace_getstackdepth(int aframes)
{
uint32_t *frame, *lastframe;
- int scp_offset;
int depth = 1;
frame = (uint32_t *)__builtin_frame_address(0);;
lastframe = NULL;
- scp_offset = -(get_pc_str_offset() 2);
while (frame != NULL) {
- db_addr_t scp;
#if 0
uint32_t savecode;
int r;
uint32_t *rp;
#endif
- /*
- * In theory, the SCP isn't guaranteed to be in the function
- * that generated the stack frame. We hope for the best.
- */
- scp = frame[FR_SCP];
-
depth++;
/*
@@ -229,7 +214,7 @@ dtrace_getstackdepth(int aframes)
}
ulong_t
-dtrace_getreg(struct trapframe *rp, uint_t reg)
+dtrace_getreg(struct regs *regs, uint_t reg)
{
return (0);
@@ -241,7 +226,7 @@ dtrace_copycheck(uintptr_t uaddr, uintpt
if (uaddr + size VM_MAXUSER_ADDRESS || uaddr + size uaddr) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
- cpu_core[curcpu].cpuc_dtrace_illval = uaddr;
+ cpu_core[cpu_number()].cpuc_dtrace_illval = uaddr;
return (0);
}
@@ -285,7 +270,7 @@ dtrace_fuword8(void *uaddr)
{
if ((uintptr_t)uaddr VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
- cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
+ cpu_core[cpu_number()].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
}
return (dtrace_fuword8_nocheck(uaddr));
@@ -296,7 +281,7 @@ dtrace_fuword16(void *uaddr)
{
if ((uintptr_t)uaddr VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
- cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
+ cpu_core[cpu_number()].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
}
return (dtrace_fuword16_nocheck(uaddr));
@@ -307,7 +292,7 @@ dtrace_fuword32(void *uaddr)
{
if ((uintptr_t)uaddr VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
- cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
+ cpu_core[cpu_number()].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
}
return (dtrace_fuword32_nocheck(uaddr));
@@ -318,7 +303,7 @@ dtrace_fuword64(void *uaddr)
{
if ((uintptr_t)uaddr VM_MAXUSER_ADDRESS) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR);
- cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr;
+ cpu_core[cpu_number()].cpuc_dtrace_illval = (uintptr_t)uaddr;
return (0);
}
return (dtrace_fuword64_nocheck(uaddr));
CVS commit: src/sys/netipsec
Module Name:src
Committed By: ozaki-r
Date: Sat Mar 8 12:18:04 UTC 2014
Modified Files:
src/sys/netipsec: ipsec_input.c
Log Message:
Mark a variable __diagused
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/netipsec/ipsec_input.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/ipsec_input.c
diff -u src/sys/netipsec/ipsec_input.c:1.31 src/sys/netipsec/ipsec_input.c:1.32
--- src/sys/netipsec/ipsec_input.c:1.31 Sun Nov 3 18:37:10 2013
+++ src/sys/netipsec/ipsec_input.c Sat Mar 8 12:18:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_input.c,v 1.31 2013/11/03 18:37:10 mrg Exp $ */
+/* $NetBSD: ipsec_input.c,v 1.32 2014/03/08 12:18:04 ozaki-r Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
/* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipsec_input.c,v 1.31 2013/11/03 18:37:10 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipsec_input.c,v 1.32 2014/03/08 12:18:04 ozaki-r Exp $);
/*
* IPsec input processing.
@@ -592,7 +592,7 @@ int
ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int protoff,
struct m_tag *mt)
{
- int af, sproto;
+ int af __diagused, sproto;
struct ip6_hdr *ip6;
struct m_tag *mtag;
struct tdb_ident *tdbi;
CVS commit: src/sys/arch/acorn26
Module Name:src
Committed By: skrll
Date: Sat Mar 8 15:46:20 UTC 2014
Modified Files:
src/sys/arch/acorn26/acorn26: except.c
src/sys/arch/acorn26/iobus: ioc.c
src/sys/arch/acorn26/ioc: latches.c
Log Message:
Remove unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn26/acorn26/except.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/acorn26/iobus/ioc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/acorn26/ioc/latches.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/except.c
diff -u src/sys/arch/acorn26/acorn26/except.c:1.30 src/sys/arch/acorn26/acorn26/except.c:1.31
--- src/sys/arch/acorn26/acorn26/except.c:1.30 Sun Aug 18 16:08:42 2013
+++ src/sys/arch/acorn26/acorn26/except.c Sat Mar 8 15:46:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: except.c,v 1.30 2013/08/18 16:08:42 matt Exp $ */
+/* $NetBSD: except.c,v 1.31 2014/03/08 15:46:20 skrll Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
* All rights reserved.
@@ -31,7 +31,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: except.c,v 1.30 2013/08/18 16:08:42 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: except.c,v 1.31 2014/03/08 15:46:20 skrll Exp $);
#include opt_ddb.h
@@ -141,7 +141,7 @@ data_abort_handler(struct trapframe *tf)
vm_prot_t atype;
bool usrmode, twopages;
struct vm_map *map;
- vaddr_t pc, va;
+ vaddr_t va;
vsize_t asize;
/*
@@ -163,7 +163,6 @@ data_abort_handler(struct trapframe *tf)
lwp_settrapframe(l, tf);
LWP_CACHE_CREDS(l, p);
}
- pc = tf-tf_r15 R15_PC;
data_abort_fixup(tf);
va = data_abort_address(tf, asize);
atype = data_abort_atype(tf);
Index: src/sys/arch/acorn26/iobus/ioc.c
diff -u src/sys/arch/acorn26/iobus/ioc.c:1.21 src/sys/arch/acorn26/iobus/ioc.c:1.22
--- src/sys/arch/acorn26/iobus/ioc.c:1.21 Fri May 11 15:39:17 2012
+++ src/sys/arch/acorn26/iobus/ioc.c Sat Mar 8 15:46:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.21 2012/05/11 15:39:17 skrll Exp $ */
+/* $NetBSD: ioc.c,v 1.22 2014/03/08 15:46:20 skrll Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ioc.c,v 1.21 2012/05/11 15:39:17 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ioc.c,v 1.22 2014/03/08 15:46:20 skrll Exp $);
#include sys/param.h
#include sys/device.h
@@ -91,16 +91,13 @@ ioc_attach(device_t parent, device_t sel
{
struct ioc_softc *sc = device_private(self);
struct iobus_attach_args *ioa = aux;
- bus_space_tag_t bst;
- bus_space_handle_t bsh;
sc-sc_dev = the_ioc = self;
sc-sc_bst = ioa-ioa_tag;
if (bus_space_map(ioa-ioa_tag, ioa-ioa_base, 0x0020,
0, (sc-sc_bsh)) != 0)
panic(%s: couldn't map, device_xname(self));
- bst = sc-sc_bst;
- bsh = sc-sc_bsh;
+
/* Now we need to set up bits of the IOC */
/* Control register: All bits high (input) is probably safe */
ioc_ctl_write(self, 0xff, 0xff);
Index: src/sys/arch/acorn26/ioc/latches.c
diff -u src/sys/arch/acorn26/ioc/latches.c:1.8 src/sys/arch/acorn26/ioc/latches.c:1.9
--- src/sys/arch/acorn26/ioc/latches.c:1.8 Fri May 11 15:39:18 2012
+++ src/sys/arch/acorn26/ioc/latches.c Sat Mar 8 15:46:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: latches.c,v 1.8 2012/05/11 15:39:18 skrll Exp $ */
+/* $NetBSD: latches.c,v 1.9 2014/03/08 15:46:20 skrll Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -29,7 +29,7 @@
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: latches.c,v 1.8 2012/05/11 15:39:18 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: latches.c,v 1.9 2014/03/08 15:46:20 skrll Exp $);
#include sys/device.h
#include sys/systm.h
@@ -79,14 +79,12 @@ latches_attach(device_t parent, device_t
{
struct latches_softc *sc = device_private(self);
struct ioc_attach_args *ioc = aux;
- bus_space_tag_t iot;
- bus_space_handle_t ioh;
sc-sc_dev = self;
if (the_latches == NULL)
the_latches = self;
- iot = sc-sc_iot = ioc-ioc_fast_t;
- ioh = sc-sc_ioh = ioc-ioc_fast_h;
+ sc-sc_iot = ioc-ioc_fast_t;
+ sc-sc_ioh = ioc-ioc_fast_h;
sc-sc_latcha =
LATCHA_NSEL0 | LATCHA_NSEL1 | LATCHA_NSEL2 | LATCHA_NSEL3 |
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: martin
Date: Sat Mar 8 16:36:24 UTC 2014
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Fix wrong variable name, PR bin/48647 from Jim Bernard.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.164 src/usr.sbin/postinstall/postinstall:1.165
--- src/usr.sbin/postinstall/postinstall:1.164 Sat Feb 15 01:54:17 2014
+++ src/usr.sbin/postinstall/postinstall Sat Mar 8 16:36:24 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.164 2014/02/15 01:54:17 jmmv Exp $
+# $NetBSD: postinstall,v 1.165 2014/03/08 16:36:24 martin Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -905,7 +905,7 @@ do_fontconfig()
msg \
Broken fontconfig configuration found; please delete these files
msg \
-in the ${DESTDIR}/etc/fonts/conf.d/ subdirectory:
+in the ${DEST_DIR}/etc/fonts/conf.d/ subdirectory:
msg \
10-autohint.conf 10-no-sub-pixel.conf 10-sub-pixel-bgr.conf
msg \
@@ -1562,7 +1562,7 @@ ${pcpath} was a directory, should be a f
_notfixed=${NOT_FIXED}
fi
- if [ ! -d ${DESTDIR}${pcpath} ]; then
+ if [ ! -d ${DEST_DIR}${pcpath} ]; then
return 0
fi
@@ -1578,7 +1578,7 @@ ${pcpath} was a directory, should be a f
# If the directory was removed above, then try to replace it with
# a file.
- if [ -d ${DESTDIR}${pcpath} ]; then
+ if [ -d ${DEST_DIR}${pcpath} ]; then
msg ${filemsg}${_notfixed}
failed=$(( ${failed} + 1 ))
else
CVS commit: src/sys/arch/acorn26/acorn26
Module Name:src
Committed By: skrll
Date: Sat Mar 8 16:55:38 UTC 2014
Modified Files:
src/sys/arch/acorn26/acorn26: db_interface.c
Log Message:
Make db_validate_address compile under 4.8
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn26/acorn26/db_interface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/db_interface.c
diff -u src/sys/arch/acorn26/acorn26/db_interface.c:1.19 src/sys/arch/acorn26/acorn26/db_interface.c:1.20
--- src/sys/arch/acorn26/acorn26/db_interface.c:1.19 Sat Jan 5 15:04:00 2013
+++ src/sys/arch/acorn26/acorn26/db_interface.c Sat Mar 8 16:55:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.19 2013/01/05 15:04:00 christos Exp $ */
+/* $NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.19 2013/01/05 15:04:00 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.20 2014/03/08 16:55:38 skrll Exp $);
#include opt_ddb.h
@@ -169,11 +169,10 @@ volatile bool db_validating, db_faulted;
int
db_validate_address(vm_offset_t addr)
{
- volatile uint8_t tmp;
db_faulted = false;
db_validating = true;
- tmp = *(uint8_t *)addr;
+ (void) *(volatile uint8_t *)addr;
db_validating = false;
return db_faulted;
}
CVS commit: src/sys/arch/zaurus/zaurus
Module Name:src Committed By: skrll Date: Sat Mar 8 17:05:09 UTC 2014 Modified Files: src/sys/arch/zaurus/zaurus: kloader_machdep.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/zaurus/kloader_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/zaurus/zaurus/kloader_machdep.c diff -u src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.6 src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.7 --- src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.6 Sat Jan 21 18:56:51 2012 +++ src/sys/arch/zaurus/zaurus/kloader_machdep.c Sat Mar 8 17:05:08 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kloader_machdep.c,v 1.6 2012/01/21 18:56:51 nonaka Exp $ */ +/* $NetBSD: kloader_machdep.c,v 1.7 2014/03/08 17:05:08 skrll Exp $ */ /*- * Copyright (C) 2009-2012 NONAKA Kimihiro non...@netbsd.org @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.6 2012/01/21 18:56:51 nonaka Exp $); +__KERNEL_RCSID(0, $NetBSD: kloader_machdep.c,v 1.7 2014/03/08 17:05:08 skrll Exp $); #include debug_kloader.h @@ -78,7 +78,7 @@ kloader_zaurus_jump(kloader_bootfunc_t f extern char KERNEL_BASE_virt[]; void (*bootinfop)(void *, void *); uint32_t *bootmagicp; - vaddr_t top, ptr; + vaddr_t ptr; struct bootinfo *bootinfo; struct btinfo_howto *bi_howto; struct btinfo_rootdevice *bi_rootdv; @@ -96,7 +96,7 @@ kloader_zaurus_jump(kloader_bootfunc_t f memset(bootmagicp, 0, BOOTARGS_BUFSIZ); bootinfo = (struct bootinfo *)(bootmagicp + 1); bootinfo-nentries = 0; - top = ptr = (vaddr_t)bootinfo-info; + ptr = (vaddr_t)bootinfo-info; /* pass to howto for new kernel */ bi_howto = (struct btinfo_howto *)ptr;
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: martin
Date: Sat Mar 8 17:05:47 UTC 2014
Modified Files:
src/tests/lib/libm: t_atan.c
Log Message:
no NaN tests for vax
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/lib/libm/t_atan.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_atan.c
diff -u src/tests/lib/libm/t_atan.c:1.13 src/tests/lib/libm/t_atan.c:1.14
--- src/tests/lib/libm/t_atan.c:1.13 Fri Mar 7 12:46:47 2014
+++ src/tests/lib/libm/t_atan.c Sat Mar 8 17:05:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_atan.c,v 1.13 2014/03/07 12:46:47 martin Exp $ */
+/* $NetBSD: t_atan.c,v 1.14 2014/03/08 17:05:47 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -57,8 +57,12 @@ static const struct {
*/
ATF_LIBM_TEST(atan_nan, Test atan/atanf(NaN) == NaN)
{
+#ifdef __vax__
+ atf_tc_skip(no NaN in vax floating point format);
+#else
T_LIBM_CHECK_NAN(0, atan, T_LIBM_NAN);
T_LIBM_CHECK_NAN(0, atanf, T_LIBM_NAN);
+#endif
}
ATF_LIBM_TEST(atan_inrange, Test atan/atanf(x) for some values)
CVS commit: src/sys/arch/x68k/x68k
Module Name:src Committed By: tsutsui Date: Sat Mar 8 17:44:37 UTC 2014 Modified Files: src/sys/arch/x68k/x68k: genassym.cf locore.s Log Message: Misc cosmetic changes to reduce diffs from other m68k ports. - replace magic numbers with macro via genassym.cf - include opt_fpu_emulate.h at the top - use C-style comments - add register '%' prefix in comments - sync several comments - indent adjustments etc. No text binary changes. (only .global _KERNEL_OPT_FPU_EMULATE is moved) To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x68k/x68k/genassym.cf cvs rdiff -u -r1.113 -r1.114 src/sys/arch/x68k/x68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/x68k/genassym.cf diff -u src/sys/arch/x68k/x68k/genassym.cf:1.33 src/sys/arch/x68k/x68k/genassym.cf:1.34 --- src/sys/arch/x68k/x68k/genassym.cf:1.33 Fri Jan 14 02:06:33 2011 +++ src/sys/arch/x68k/x68k/genassym.cf Sat Mar 8 17:44:37 2014 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.33 2011/01/14 02:06:33 rmind Exp $ +# $NetBSD: genassym.cf,v 1.34 2014/03/08 17:44:37 tsutsui Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -158,6 +158,8 @@ define SPL6 PSL_S | PSL_IPL6 # magic define FC_USERD FC_USERD define FC_SUPERD FC_SUPERD +define DC_FREEZE DC_FREEZE +define CACHE40_ON CACHE40_ON define CACHE_ON CACHE_ON define CACHE_OFF CACHE_OFF define CACHE_CLR CACHE_CLR Index: src/sys/arch/x68k/x68k/locore.s diff -u src/sys/arch/x68k/x68k/locore.s:1.113 src/sys/arch/x68k/x68k/locore.s:1.114 --- src/sys/arch/x68k/x68k/locore.s:1.113 Fri Jan 31 18:49:35 2014 +++ src/sys/arch/x68k/x68k/locore.s Sat Mar 8 17:44:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.113 2014/01/31 18:49:35 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.114 2014/03/08 17:44:37 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -45,6 +45,7 @@ #include opt_fpsp.h #include opt_kgdb.h #include opt_lockdebug.h +#include opt_fpu_emulate.h #include opt_m68k_arch.h #include ite.h @@ -55,8 +56,10 @@ #include machine/asm.h -| This is for kvm_mkdb, and should be the address of the beginning -| of the kernel text segment (not necessarily the same as kernbase). +/* + * This is for kvm_mkdb, and should be the address of the beginning + * of the kernel text segment (not necessarily the same as kernbase). + */ .text GLOBAL(kernel_text) @@ -84,8 +87,8 @@ ASLOCAL(tmpstk) /* * Macro to relocate a symbol, used before MMU is enabled. */ -#define _RELOC(var, ar) \ - lea var,ar; \ +#define _RELOC(var, ar) \ + lea var,ar; \ addl %a5,ar #define RELOC(var, ar) _RELOC(_C_LABEL(var), ar) @@ -100,6 +103,7 @@ ASLOCAL(tmpstk) * through ROM until MMU is turned on at which time they will vector * through our table (vectors.s). */ + BSS(lowram,4) BSS(esym,4) @@ -143,7 +147,7 @@ ASENTRY_NOPROFILE(start) movc %d0,%cacr | clear and disable on-chip cache(s) /* determine our CPU/MMU combo - check for all regardless of kernel config */ - movl #0x200,%d0 | data freeze bit + movl #DC_FREEZE,%d0 | data freeze bit movc %d0,%cacr | only exists on 68030 movc %cacr,%d0 | read it back tstl %d0 | zero? @@ -196,6 +200,7 @@ Lstart1: subl %d0,%d1 | compute amount of RAM present RELOC(physmem, %a0) movl %d1,%a0@ | and physmem + /* configure kernel and lwp0 VA space so we can get going */ #if NKSYMS || defined(DDB) || defined(MODULAR) RELOC(esym,%a0) | end of static kernel test/data/syms @@ -225,7 +230,7 @@ Lstart2: RELOC(mmutype, %a0) cmpl #MMU_68040,%a0@ | 68040? jne Lmotommu1 | no, skip - .long 0x4e7b1807 | movc d1,srp + .long 0x4e7b1807 | movc %d1,%srp jra Lstploaddone Lmotommu1: RELOC(protorp, %a0) @@ -242,9 +247,9 @@ Lstploaddone: /* JUPITER-X: set system register SUPER bit */ movl #0x0200a240,%d0 | translate DRAM area transparently .long 0x4e7b0006 | movc d0,dtt0 - lea 0x00c0,%a0 | a0: graphic VRAM - lea 0x02c0,%a1 | a1: graphic VRAM ( not JUPITER-X ) - | DRAM ( JUPITER-X ) + lea 0x00c0,%a0 | %a0: graphic VRAM + lea 0x02c0,%a1 | %a1: graphic VRAM ( not JUPITER-X ) + | DRAM ( JUPITER-X ) movw %a0@,%d0 movw %d0,%d1 notw %d1 @@ -253,15 +258,15 @@ Lstploaddone: cmpw %a1@,%d1 | JUPITER-X? jne Ljupiterdone | no, skip movl #0x0100a240,%d0 | to access system register - .long 0x4e7b0006 | movc d0,dtt0 + .long 0x4e7b0006 | movc %d0,%dtt0 movb #0x01,0x0183 | set SUPER bit Ljupiterdone: #endif /* JUPITER */ moveq #0,%d0 | ensure TT regs are disabled - .long 0x4e7b0004 | movc d0,itt0 - .long 0x4e7b0005 | movc d0,itt1 - .long 0x4e7b0006 | movc d0,dtt0 - .long 0x4e7b0007 | movc d0,dtt1 + .long 0x4e7b0004 | movc %d0,%itt0 + .long 0x4e7b0005 | movc %d0,%itt1 + .long 0x4e7b0006 | movc %d0,%dtt0 + .long 0x4e7b0007 | movc %d0,%dtt1 .word 0xf4d8 | cinva bc .word 0xf518 | pflusha #if PGSHIFT ==
CVS commit: src/sys/arch/evbarm/tsarm
Module Name:src Committed By: skrll Date: Sat Mar 8 18:07:39 UTC 2014 Modified Files: src/sys/arch/evbarm/tsarm: tsarm_machdep.c Log Message: Hide unused variables in #ifdef FIXME To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/tsarm/tsarm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/tsarm/tsarm_machdep.c diff -u src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.21 src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.22 --- src/sys/arch/evbarm/tsarm/tsarm_machdep.c:1.21 Sun Aug 18 15:58:21 2013 +++ src/sys/arch/evbarm/tsarm/tsarm_machdep.c Sat Mar 8 18:07:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: tsarm_machdep.c,v 1.21 2013/08/18 15:58:21 matt Exp $ */ +/* $NetBSD: tsarm_machdep.c,v 1.22 2014/03/08 18:07:39 skrll Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tsarm_machdep.c,v 1.21 2013/08/18 15:58:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: tsarm_machdep.c,v 1.22 2014/03/08 18:07:39 skrll Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -378,10 +378,11 @@ initarm(void *arg) int loop; int loop1; u_int l1pagetable; + +#ifdef FIXME paddr_t memstart; psize_t memsize; -#ifdef FIXME /* Calibrate the delay loop. */ i80321_calibrate_delay(); #endif @@ -415,7 +416,7 @@ initarm(void *arg) */ i80321_sdram_bounds(obio_bs_tag, VERDE_PMMR_BASE + VERDE_MCU_BASE, memstart, memsize); -#else + memstart = 0x0; memsize = 0x200; #endif
CVS commit: src/sys/arch/evbarm/tsarm/isa
Module Name:src
Committed By: skrll
Date: Sat Mar 8 18:08:16 UTC 2014
Modified Files:
src/sys/arch/evbarm/tsarm/isa: isa_machdep.c
Log Message:
Fix a bug found by gcc 4.8
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/tsarm/isa/isa_machdep.c
diff -u src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.12 src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.13
--- src/sys/arch/evbarm/tsarm/isa/isa_machdep.c:1.12 Sat Oct 27 17:17:49 2012
+++ src/sys/arch/evbarm/tsarm/isa/isa_machdep.c Sat Mar 8 18:08:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.12 2012/10/27 17:17:49 chs Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.13 2014/03/08 18:08:16 skrll Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.12 2012/10/27 17:17:49 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: isa_machdep.c,v 1.13 2014/03/08 18:08:16 skrll Exp $);
#include opt_irqstats.h
@@ -116,7 +116,7 @@ isa_intr_alloc(isa_chipset_tag_t ic, int
/* some interrupts should never be dynamically allocated */
mask = 0x00e0;
- for (i = 0; i sizeof(isairq); i++) {
+ for (i = 0; i __arraycount(isairq); i++) {
if ((mask (1isairq[i])) == 0)
continue;
if (isairq_nhandlers[i] count || count == -1) {
@@ -147,7 +147,7 @@ isa_intr_establish(isa_chipset_tag_t ic,
{
int epirq = -1, i;
/* Find real EP93XX irq number */
- for(i = 0; i sizeof(isairq); i++) {
+ for(i = 0; i __arraycount(isairq); i++) {
if (irq == isairq[i]) epirq = ep93xxirq[i];
}
CVS commit: src/sys/arch/arm/ep93xx
Module Name:src
Committed By: skrll
Date: Sat Mar 8 18:08:48 UTC 2014
Modified Files:
src/sys/arch/arm/ep93xx: epcom.c epe.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/ep93xx/epcom.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/ep93xx/epe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/ep93xx/epcom.c
diff -u src/sys/arch/arm/ep93xx/epcom.c:1.24 src/sys/arch/arm/ep93xx/epcom.c:1.25
--- src/sys/arch/arm/ep93xx/epcom.c:1.24 Mon Nov 12 18:00:36 2012
+++ src/sys/arch/arm/ep93xx/epcom.c Sat Mar 8 18:08:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom.c,v 1.24 2012/11/12 18:00:36 skrll Exp $ */
+/* $NetBSD: epcom.c,v 1.25 2014/03/08 18:08:48 skrll Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: epcom.c,v 1.24 2012/11/12 18:00:36 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: epcom.c,v 1.25 2014/03/08 18:08:48 skrll Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -874,7 +874,7 @@ epcomcngetc(dev_t dev)
if (!db_active)
#endif
{
- int cn_trapped = 0; /* unused */
+ int cn_trapped __unused = 0;
cn_check_magic(dev, c, epcom_cnm_state);
}
@@ -1017,10 +1017,9 @@ epcomintr(void* arg)
u_char *put, *end;
u_int cc;
u_int flagr;
- u_int intr;
uint32_t c, csts;
- intr = bus_space_read_4(iot, ioh, EPCOM_IntIDIntClr);
+ (void) bus_space_read_4(iot, ioh, EPCOM_IntIDIntClr);
if (COM_ISALIVE(sc) == 0)
panic(intr on disabled epcom);
Index: src/sys/arch/arm/ep93xx/epe.c
diff -u src/sys/arch/arm/ep93xx/epe.c:1.30 src/sys/arch/arm/ep93xx/epe.c:1.31
--- src/sys/arch/arm/ep93xx/epe.c:1.30 Sun Mar 2 13:22:21 2014
+++ src/sys/arch/arm/ep93xx/epe.c Sat Mar 8 18:08:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: epe.c,v 1.30 2014/03/02 13:22:21 joerg Exp $ */
+/* $NetBSD: epe.c,v 1.31 2014/03/08 18:08:48 skrll Exp $ */
/*
* Copyright (c) 2004 Jesse Off
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: epe.c,v 1.30 2014/03/02 13:22:21 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: epe.c,v 1.31 2014/03/08 18:08:48 skrll Exp $);
#include sys/types.h
#include sys/param.h
@@ -460,11 +460,8 @@ epe_mediachange(struct ifnet *ifp)
int
epe_mii_readreg(device_t self, int phy, int reg)
{
- struct epe_softc *sc;
uint32_t d, v;
- sc = device_private(self);
-
d = EPE_READ(SelfCtl);
EPE_WRITE(SelfCtl, d ~SelfCtl_PSPRS); /* no preamble suppress */
EPE_WRITE(MIICmd, (MIICmd_READ | (phy 5) | reg));
@@ -477,11 +474,8 @@ epe_mii_readreg(device_t self, int phy,
void
epe_mii_writereg(device_t self, int phy, int reg, int val)
{
- struct epe_softc *sc;
uint32_t d;
- sc = device_private(self);
-
d = EPE_READ(SelfCtl);
EPE_WRITE(SelfCtl, d ~SelfCtl_PSPRS); /* no preamble suppress */
EPE_WRITE(MIIData, val);
CVS commit: src/external/gpl3/gcc/dist/gcc/config/i386
Module Name:src Committed By: martin Date: Sat Mar 8 19:15:32 UTC 2014 Modified Files: src/external/gpl3/gcc/dist/gcc/config/i386: pmm_malloc.h Log Message: Kill the throw() on a forward declaration for posix_memalign (it does not match our base declaration and may cause warnings). Ok: joerg To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/i386/pmm_malloc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/i386/pmm_malloc.h diff -u src/external/gpl3/gcc/dist/gcc/config/i386/pmm_malloc.h:1.1.1.2 src/external/gpl3/gcc/dist/gcc/config/i386/pmm_malloc.h:1.2 --- src/external/gpl3/gcc/dist/gcc/config/i386/pmm_malloc.h:1.1.1.2 Sat Mar 1 08:43:17 2014 +++ src/external/gpl3/gcc/dist/gcc/config/i386/pmm_malloc.h Sat Mar 8 19:15:32 2014 @@ -31,7 +31,7 @@ #ifndef __cplusplus extern int posix_memalign (void **, size_t, size_t); #else -extern C int posix_memalign (void **, size_t, size_t) throw (); +extern C int posix_memalign (void **, size_t, size_t); #endif static __inline void *
CVS commit: src/usr.bin/systat
Module Name:src
Committed By: jdc
Date: Sat Mar 8 20:51:20 UTC 2014
Modified Files:
src/usr.bin/systat: disks.c
Log Message:
Restore lost break.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/systat/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/systat/disks.c
diff -u src/usr.bin/systat/disks.c:1.18 src/usr.bin/systat/disks.c:1.19
--- src/usr.bin/systat/disks.c:1.18 Fri Oct 18 22:42:31 2013
+++ src/usr.bin/systat/disks.c Sat Mar 8 20:51:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.18 2013/10/18 22:42:31 bad Exp $ */
+/* $NetBSD: disks.c,v 1.19 2014/03/08 20:51:20 jdc Exp $ */
/*-
* Copyright (c) 1980, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)disks.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: disks.c,v 1.18 2013/10/18 22:42:31 bad Exp $);
+__RCSID($NetBSD: disks.c,v 1.19 2014/03/08 20:51:20 jdc Exp $);
#endif /* not lint */
#include ctype.h
@@ -102,6 +102,7 @@ drvselect(char *args, int truefalse, int
for (i = 0; i ndrive; i++)
if (fnmatch(args, dr_name[i], 0) == 0) {
selections[i] = truefalse;
+break;
}
if (i = ndrive)
error(%s: unknown drive, args);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: hkenken Date: Sat Mar 8 23:38:52 UTC 2014 Added Files: src/sys/arch/evbarm/conf: NETWALKER_INSTALL Log Message: add NETWALKER_INSTALL To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/NETWALKER_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/arch/evbarm/conf/NETWALKER_INSTALL diff -u /dev/null src/sys/arch/evbarm/conf/NETWALKER_INSTALL:1.1 --- /dev/null Sat Mar 8 23:38:52 2014 +++ src/sys/arch/evbarm/conf/NETWALKER_INSTALL Sat Mar 8 23:38:52 2014 @@ -0,0 +1,8 @@ +# $NetBSD: NETWALKER_INSTALL,v 1.1 2014/03/08 23:38:52 hkenken Exp $ +# +# NETWALKER_INSTALL -- NETWALKER kernel with installation-sized +# ramdisk +# + +include arch/evbarm/conf/NETWALKER +include arch/evbarm/conf/INSTALL
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src Committed By: agc Date: Sun Mar 9 00:15:46 UTC 2014 Modified Files: src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile src/crypto/external/bsd/netpgp/dist/src: Makefile.am src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.in main.c netpgpverify.1 Added Files: src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd Makefile.lib.in Makefile.libtool.in NetBSD-6.0_RC1_hashes.asc NetBSD-6.0_RC1_hashes.gpg TODO array.h b64.c b64.h bignum.c bn.h bufgap.c bufgap.h bzlib.c bzlib.h bzlib_private.h chk.sh configure data data.gpg data.sig defs.h digest.c digest.h libnetpgpverify.3 libverify.c md5.h md5c.c misc.c misc.h pgpsum.c pgpsum.h pubring.gpg rmd160.c rmd160.h rsa.c rsa.h sha1.c sha1.h sha2.c sha2.h sshtest-20140202 sshtest-20140202.pub tiger.c tiger.h verify.h zlib.c zlib.h Log Message: Bring over the standalone netpgpverify sources from pkgsrc/security/netpgpverify. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/dist/src/Makefile.am cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.lib.in \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.libtool.in \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/NetBSD-6.0_RC1_hashes.asc \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/NetBSD-6.0_RC1_hashes.gpg \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/TODO \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/array.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/b64.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bignum.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bn.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bufgap.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bufgap.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib_private.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/chk.sh \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/configure \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/data \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/data.gpg \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/data.sig \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/defs.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/digest.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libnetpgpverify.3 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/md5.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/md5c.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pgpsum.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/pubring.gpg \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rmd160.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/rsa.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha1.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sshtest-20140202 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/sshtest-20140202.pub \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/tiger.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/zlib.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1 cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the
CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src Committed By: agc Date: Sun Mar 9 00:17:28 UTC 2014 Added Files: src/crypto/external/bsd/netpgp/bin/netpgpverify: config.h Log Message: Add the config.h file as part of the reachover infrastructure To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h:1.1 --- /dev/null Sun Mar 9 00:17:28 2014 +++ src/crypto/external/bsd/netpgp/bin/netpgpverify/config.h Sun Mar 9 00:17:28 2014 @@ -0,0 +1,12 @@ +#ifndef CONFIG_H_ +#define CONFIG_H_ 20140308 + +#ifndef __UNCONST +#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) +#endif /* __UNCONST */ + +#ifndef USE_ARG +#define USE_ARG(x) /*LINTED*/(void)(x) +#endif /* USE_ARG */ + +#endif /* CONFIG_H_ */
CVS commit: src/crypto/external/bsd/netpgp/netpgpverify
Module Name:src Committed By: agc Date: Sun Mar 9 00:18:29 UTC 2014 Removed Files: src/crypto/external/bsd/netpgp/netpgpverify: Makefile Log Message: Clean up the reachover infrastructure - the programs now live under the bin subdirectory To generate a diff of this commit: cvs rdiff -u -r1.6 -r0 src/crypto/external/bsd/netpgp/netpgpverify/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src
Committed By: agc
Date: Sun Mar 9 00:24:47 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/bin: Makefile
Added Files:
src/crypto/external/bsd/netpgp/bin/netpgp: Makefile
Removed Files:
src/crypto/external/bsd/netpgp/netpgp: Makefile
Log Message:
Move the netpgp directory (for the executable) under the bin reachover
directory
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/bin/Makefile
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/netpgp/netpgp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.4 src/crypto/external/bsd/netpgp/bin/Makefile:1.5
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.4 Tue Nov 20 05:26:25 2012
+++ src/crypto/external/bsd/netpgp/bin/Makefile Sun Mar 9 00:24:47 2014
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2012/11/20 05:26:25 agc Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/09 00:24:47 agc Exp $
+SUBDIR+= netpgp
SUBDIR+= netpgpverify
.include bsd.subdir.mk
Added files:
Index: src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgp/Makefile:1.2
--- /dev/null Sun Mar 9 00:24:47 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgp/Makefile Sun Mar 9 00:24:47 2014
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.2 2014/03/09 00:24:47 agc Exp $
+
+.include bsd.own.mk
+
+PROG= netpgp
+BINDIR= /usr/bin
+
+CPPFLAGS+= -I${EXTDIST}/include
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPDIR} -lnetpgp
+DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!= cd ${.CURDIR}/../../libmj ${PRINTOBJDIR}
+LDADD+= -L${LIBMJDIR} -lmj
+DPADD+= ${LIBMJDIR}/libmj.a
+
+LDADD+= -lcrypto -lz -lbz2
+DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+MAN= netpgp.1
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/netpgp
+
+.include bsd.prog.mk
CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src Committed By: agc Date: Sun Mar 9 00:27:54 UTC 2014 Modified Files: src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile Log Message: Install the binary in the correct location To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.5 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.6 --- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.5 Sun Mar 9 00:15:46 2014 +++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sun Mar 9 00:27:54 2014 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2014/03/09 00:15:46 agc Exp $ +# $NetBSD: Makefile,v 1.6 2014/03/09 00:27:54 agc Exp $ PROG=netpgpverify +BINDIR= /usr/bin SRCS= b64.c bignum.c bufgap.c digest.c SRCS+= libverify.c main.c misc.c
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src
Committed By: agc
Date: Sun Mar 9 00:33:51 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp: Makefile
src/crypto/external/bsd/netpgp/bin: Makefile
src/crypto/external/bsd/netpgp/dist: configure configure.ac tst
src/crypto/external/bsd/netpgp/lib: Makefile
Added Files:
src/crypto/external/bsd/netpgp/bin/netpgpkeys: Makefile
Removed Files:
src/crypto/external/bsd/netpgp/netpgpkeys: Makefile
Log Message:
Move netpgpkeys into the correct place in the reachover insfrastructure
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/bin/Makefile
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
cvs rdiff -u -r1.41 -r1.42 src/crypto/external/bsd/netpgp/dist/configure \
src/crypto/external/bsd/netpgp/dist/configure.ac
cvs rdiff -u -r1.31 -r1.32 src/crypto/external/bsd/netpgp/dist/tst
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r1.4 -r0 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/Makefile:1.6 src/crypto/external/bsd/netpgp/Makefile:1.7
--- src/crypto/external/bsd/netpgp/Makefile:1.6 Tue Nov 20 05:26:24 2012
+++ src/crypto/external/bsd/netpgp/Makefile Sun Mar 9 00:33:50 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2012/11/20 05:26:24 agc Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/09 00:33:50 agc Exp $
-SUBDIR= libmj .WAIT
+SUBDIR+= libmj .WAIT
SUBDIR+= lib/verify .WAIT
SUBDIR+= lib .WAIT
-SUBDIR+= netpgp netpgpkeys bin
+SUBDIR+= bin
#SUBDIR+= hkpc hkpd
.include bsd.subdir.mk
Index: src/crypto/external/bsd/netpgp/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.5 src/crypto/external/bsd/netpgp/bin/Makefile:1.6
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.5 Sun Mar 9 00:24:47 2014
+++ src/crypto/external/bsd/netpgp/bin/Makefile Sun Mar 9 00:33:50 2014
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/03/09 00:24:47 agc Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/09 00:33:50 agc Exp $
SUBDIR+= netpgp
+SUBDIR+= netpgpkeys
SUBDIR+= netpgpverify
.include bsd.subdir.mk
Index: src/crypto/external/bsd/netpgp/dist/configure
diff -u src/crypto/external/bsd/netpgp/dist/configure:1.41 src/crypto/external/bsd/netpgp/dist/configure:1.42
--- src/crypto/external/bsd/netpgp/dist/configure:1.41 Fri Feb 21 01:55:10 2014
+++ src/crypto/external/bsd/netpgp/dist/configure Sun Mar 9 00:33:50 2014
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.40 .
+# From configure.ac Revision: 1.41 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for netpgp 20140220.
#
@@ -3191,7 +3191,6 @@ $as_echo no 6; }
SET_MAKE=MAKE=${MAKE-make}
fi
-AM_PROG_AR
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of $ac_prog, so it can be a program name with args.
@@ -4803,13 +4802,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface=BSD nm
echo int some_variable = 0; conftest.$ac_ext
- (eval echo \\$as_me:4806: $ac_compile\ 5)
+ (eval echo \\$as_me:4805: $ac_compile\ 5)
(eval $ac_compile 2conftest.err)
cat conftest.err 5
- (eval echo \\$as_me:4809: $NM \\\conftest.$ac_objext 5)
+ (eval echo \\$as_me:4808: $NM \\\conftest.$ac_objext 5)
(eval $NM \conftest.$ac_objext\ 2conftest.err conftest.out)
cat conftest.err 5
- (eval echo \\$as_me:4812: output\ 5)
+ (eval echo \\$as_me:4811: output\ 5)
cat conftest.out 5
if $GREP 'External.*some_variable' conftest.out /dev/null; then
lt_cv_nm_interface=MS dumpbin
@@ -6015,7 +6014,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6018 configure' conftest.$ac_ext
+ echo '#line 6017 configure' conftest.$ac_ext
if { { eval echo \\$as_me\:${as_lineno-$LINENO}: \$ac_compile\; } 5
(eval $ac_compile) 25
ac_status=$?
@@ -7540,11 +7539,11 @@ else
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo \\$as_me:7543: $lt_compile\ 5)
+ (eval echo \\$as_me:7542: $lt_compile\ 5)
(eval $lt_compile 2conftest.err)
ac_status=$?
cat conftest.err 5
- echo $as_me:7547: \$? = $ac_status 5
+ echo $as_me:7546: \$? = $ac_status 5
if (exit $ac_status) test -s $ac_outfile; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7879,11 +7878,11 @@ else
-e 's:.*FLAGS}\{0,1\} :$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src
Committed By: agc
Date: Sun Mar 9 00:39:31 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp: Makefile
src/crypto/external/bsd/netpgp/bin: Makefile
Added Files:
src/crypto/external/bsd/netpgp/bin/hkpc: Makefile
Removed Files:
src/crypto/external/bsd/netpgp/hkpd: Makefile
Log Message:
Move hkpc and hkpd into the correct place in the reachover insfrastructure
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/netpgp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/netpgp/bin/Makefile
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
cvs rdiff -u -r1.2 -r0 src/crypto/external/bsd/netpgp/hkpd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/Makefile:1.7 src/crypto/external/bsd/netpgp/Makefile:1.8
--- src/crypto/external/bsd/netpgp/Makefile:1.7 Sun Mar 9 00:33:50 2014
+++ src/crypto/external/bsd/netpgp/Makefile Sun Mar 9 00:39:31 2014
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2014/03/09 00:33:50 agc Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/09 00:39:31 agc Exp $
SUBDIR+= libmj .WAIT
SUBDIR+= lib/verify .WAIT
SUBDIR+= lib .WAIT
SUBDIR+= bin
-#SUBDIR+= hkpc hkpd
.include bsd.subdir.mk
Index: src/crypto/external/bsd/netpgp/bin/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/Makefile:1.6 src/crypto/external/bsd/netpgp/bin/Makefile:1.7
--- src/crypto/external/bsd/netpgp/bin/Makefile:1.6 Sun Mar 9 00:33:50 2014
+++ src/crypto/external/bsd/netpgp/bin/Makefile Sun Mar 9 00:39:31 2014
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2014/03/09 00:33:50 agc Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/09 00:39:31 agc Exp $
SUBDIR+= netpgp
SUBDIR+= netpgpkeys
SUBDIR+= netpgpverify
+#SUBDIR+= hkpc
+#SUBDIR+= hkpd
.include bsd.subdir.mk
Added files:
Index: src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpc/Makefile:1.2
--- /dev/null Sun Mar 9 00:39:31 2014
+++ src/crypto/external/bsd/netpgp/bin/hkpc/Makefile Sun Mar 9 00:39:31 2014
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.2 2014/03/09 00:39:31 agc Exp $
+
+.include bsd.own.mk
+
+PROG=hkpc
+BINDIR=/usr/bin
+SRCS=hkpc.c main.c
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPDIR} -lnetpgp
+DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!= cd ${.CURDIR}/../../libmj ${PRINTOBJDIR}
+LDADD+= -L${LIBMJDIR} -lmj
+DPADD+= ${LIBMJDIR}/libmj.a
+
+LDADD+= -lcrypto -lz -lbz2
+DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+WARNS=0
+MAN=hkpc.1
+
+.PATH: ${.CURDIR}/../../dist/src/hkpclient
+
+.include bsd.prog.mk
CVS commit: src/crypto/external/bsd/netpgp/bin/hkpd
Module Name:src
Committed By: agc
Date: Sun Mar 9 00:40:30 UTC 2014
Added Files:
src/crypto/external/bsd/netpgp/bin/hkpd: Makefile
Log Message:
Put hkpd in the right place in the reachover infrastructure
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2 src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpd/Makefile:1.2
--- /dev/null Sun Mar 9 00:40:30 2014
+++ src/crypto/external/bsd/netpgp/bin/hkpd/Makefile Sun Mar 9 00:40:30 2014
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.2 2014/03/09 00:40:30 agc Exp $
+
+.include bsd.own.mk
+
+PROG=hkpd
+BINDIR=/usr/sbin
+SRCS=hkpd.c main.c
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib ${PRINTOBJDIR}
+LDADD+= -L${LIBNETPGPDIR} -lnetpgp
+DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!= cd ${.CURDIR}/../../libmj ${PRINTOBJDIR}
+LDADD+= -L${LIBMJDIR} -lmj
+DPADD+= ${LIBMJDIR}/libmj.a
+
+LDADD+= -lcrypto -lz -lbz2
+DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+MAN=hkpd.1
+
+.PATH: ${.CURDIR}/../../dist/src/hkpd
+
+.include bsd.prog.mk
+
+t: ${PROG}
+ ./${PROG} -D
+ sleep 1
+ ftp -o- 'http://localhost:11371/pks/lookup?op=indexsearch=agcoptions=json'
+ ftp -o- 'http://localhost:11371/pks/lookup?op=getsearch=agcoptions=json'
+ ftp -o- 'http://localhost:11371/pks/lookup?op=getsearch=agcoptions=mr'
+ pkill hkpd
CVS commit: src/crypto/external/bsd/netpgp/hkpc
Module Name:src Committed By: agc Date: Sun Mar 9 00:41:42 UTC 2014 Removed Files: src/crypto/external/bsd/netpgp/hkpc: Makefile Log Message: get rid of the old reachover directory To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/netpgp/hkpc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libgcc
Module Name:src
Committed By: mrg
Date: Sun Mar 9 05:51:26 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/libgcc: config.host
Log Message:
add ia64-netbsd support.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/libgcc/config.host
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libgcc/config.host
diff -u src/external/gpl3/gcc/dist/libgcc/config.host:1.6 src/external/gpl3/gcc/dist/libgcc/config.host:1.7
--- src/external/gpl3/gcc/dist/libgcc/config.host:1.6 Wed Mar 5 00:13:41 2014
+++ src/external/gpl3/gcc/dist/libgcc/config.host Sun Mar 9 05:51:26 2014
@@ -652,6 +652,10 @@ ia64*-*-linux*)
fi
md_unwind_header=ia64/linux-unwind.h
;;
+ia64*-*-netbsd*)
+ extra_parts=${extra_parts} crtfastmath.o
+ tmake_file=${tmake_file} ia64/t-ia64 ia64/t-ia64-elf ia64/t-eh-ia64 t-crtfm
+ ;;
ia64*-*-hpux*)
tmake_file=ia64/t-ia64 ia64/t-ia64-elf ia64/t-hpux t-slibgcc ia64/t-slibgcc-hpux t-slibgcc-hpux
;;
CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src
Committed By: christos
Date: Sun Mar 9 06:57:58 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
Log Message:
proper include
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.6 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.7
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.6 Sat Mar 8 19:27:54 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sun Mar 9 01:57:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/03/09 00:27:54 agc Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/09 06:57:58 christos Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -11,7 +11,7 @@ SRCS+= bzlib.c zlib.c
SRCS+= md5c.c rmd160.c sha1.c sha2.c tiger.c
-CPPFLAGS+=-I. ${EXTDIST}/src/netpgpverify
+CPPFLAGS+=-I${.CURDIR} ${EXTDIST}/src/netpgpverify
.ifndef PRODUCTION
CPPFLAGS+=-g -O0
CVS commit: src/crypto/external/bsd/netpgp/bin/netpgpverify
Module Name:src
Committed By: christos
Date: Sun Mar 9 07:00:52 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/bin/netpgpverify: Makefile
Log Message:
WARNS=6 is impossible for this code :-)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.7 src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.8
--- src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.7 Sun Mar 9 01:57:58 2014
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile Sun Mar 9 03:00:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/09 06:57:58 christos Exp $
+# $NetBSD: Makefile,v 1.8 2014/03/09 07:00:52 christos Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -19,7 +19,7 @@ LDFLAGS+=-g -O0
.endif
MAN= netpgpverify.1
-WARNS= 6
+WARNS= 4
EXTDIST=${.CURDIR}/../../dist
CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify
Module Name:src
Committed By: christos
Date: Sun Mar 9 07:01:42 UTC 2014
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: bzlib.c main.c
Log Message:
fix unused
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.1 Sat Mar 8 19:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c Sun Mar 9 03:01:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */
+/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */
/*-*/
@@ -35,7 +35,7 @@
#include bzlib_private.h
-/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */
+/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */
/*-*/
@@ -930,6 +930,8 @@ BZFILE * bzopen_or_bzdopen
intsmallMode = 0;
intnUnused = 0;
+ __USE(blockSize100k);
+
if (mode == NULL) return NULL;
while (*mode) {
switch (*mode) {
@@ -1080,7 +1082,7 @@ const char * BZ_API(BZ2_bzerror) (BZFILE
/*-*/
/*--- end bzlib.c ---*/
/*-*/
-/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */
+/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */
/*-*/
@@ -1726,7 +1728,7 @@ Int32 BZ2_decompress ( DState* s )
/*-*/
/*--- end decompress.c ---*/
/*-*/
-/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */
+/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */
/*-*/
@@ -1830,7 +1832,7 @@ UInt32 BZ2_crc32Table[256] = {
/*-*/
/*--- endcrctable.c ---*/
/*-*/
-/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */
+/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */
/*-*/
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.4
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.3 Sat Mar 8 19:15:45 2014
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c Sun Mar 9 03:01:42 2014
@@ -122,7 +122,6 @@ verify_data(pgpv_t *pgp, const char *cmd
int
main(int argc, char **argv)
{
- const char *modifiers;
const char *keyring;
const char *cmd;
ssize_t cc;
@@ -138,7 +137,6 @@ main(int argc, char **argv)
ssh = 0;
ok = 1;
cmd = verify;
- modifiers = NULL;
while ((i = getopt(argc, argv, S:c:k:v)) != -1) {
switch(i) {
case 'S':
