CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: jnemeth
Date: Thu May 21 08:07:18 UTC 2009
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
add a dummy module_init_md()
XXX if we ever teach the boot loader to load module, we'll have to
make this actually do something
To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.240 src/sys/arch/sparc64/sparc64/machdep.c:1.241
--- src/sys/arch/sparc64/sparc64/machdep.c:1.240 Tue May 19 22:03:16 2009
+++ src/sys/arch/sparc64/sparc64/machdep.c Thu May 21 08:07:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.240 2009/05/19 22:03:16 dyoung Exp $ */
+/* $NetBSD: machdep.c,v 1.241 2009/05/21 08:07:18 jnemeth Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.240 2009/05/19 22:03:16 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.241 2009/05/21 08:07:18 jnemeth Exp $);
#include opt_ddb.h
#include opt_multiprocessor.h
@@ -2011,3 +2011,10 @@
return curcpu()-ci_idepth = 0;
}
+
+#ifdef MODULAR
+void
+module_init_md(void)
+{
+}
+#endif
CVS commit: src/doc
Module Name:src Committed By: dent Date: Thu May 21 11:25:49 UTC 2009 Modified Files: src/doc: 3RDPARTY Log Message: Capitalize NetBSD in one of the URIs to make a nbwww script happy. To generate a diff of this commit: cvs rdiff -u -r1.696 -r1.697 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.696 src/doc/3RDPARTY:1.697 --- src/doc/3RDPARTY:1.696 Wed May 20 12:44:29 2009 +++ src/doc/3RDPARTY Thu May 21 11:25:49 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.696 2009/05/20 12:44:29 dent Exp $ +# $NetBSD: 3RDPARTY,v 1.697 2009/05/21 11:25:49 dent Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -145,7 +145,7 @@ Version: 20090418 Current Vers: 20090418 Maintainer: m...@eterna.com.au -Archive Site: ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ +Archive Site: ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/ Home Page: http://eterna.com.au/bozohttpd/ Mailing List: Responsible: mrg
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Thu May 21 13:24:38 UTC 2009 Modified Files: src/sys/arch/sparc64/sparc64: vm_machdep.c Log Message: Deja Vu: when preparing the initial trap frame for a new forked lwp, explicitly clear condition code. Otherwise we might catch a signal (handlers are inherited from the parent) before we ever return to userland. The current trapframe is converted into a ucontext and after the signal handler returns, the lwp stays in userland and directly uses the ucontext to return to the fork call. Fixes PR 41302. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc64/sparc64/vm_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/sparc64/sparc64/vm_machdep.c diff -u src/sys/arch/sparc64/sparc64/vm_machdep.c:1.87 src/sys/arch/sparc64/sparc64/vm_machdep.c:1.88 --- src/sys/arch/sparc64/sparc64/vm_machdep.c:1.87 Mon Mar 16 23:11:15 2009 +++ src/sys/arch/sparc64/sparc64/vm_machdep.c Thu May 21 13:24:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.87 2009/03/16 23:11:15 dsl Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.88 2009/05/21 13:24:38 martin Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.87 2009/03/16 23:11:15 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.88 2009/05/21 13:24:38 martin Exp $); #include opt_multiprocessor.h @@ -261,9 +261,14 @@ if (stack != NULL) tf2-tf_out[6] = (uint64_t)(u_long)stack + stacksize; - /* Set return values in child mode */ + /* + * Set return values in child mode and clear condition code, + * in case we end up running a signal handler before returning + * to userland. + */ tf2-tf_out[0] = 0; tf2-tf_out[1] = 1; + tf2-tf_tstate = ~TSTATE_CCR; /* Construct kernel frame to return to in cpu_switch() */ rp = (struct rwindow *)((u_long)npcb + TOPFRAMEOFF);
CVS commit: src/usr.bin/rfcomm_sppd
Module Name:src
Committed By: plunky
Date: Thu May 21 14:44:01 UTC 2009
Modified Files:
src/usr.bin/rfcomm_sppd: rfcomm_sppd.c
Log Message:
use system provided MAX(a, b) macro instead of defining our own
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/rfcomm_sppd/rfcomm_sppd.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/rfcomm_sppd/rfcomm_sppd.c
diff -u src/usr.bin/rfcomm_sppd/rfcomm_sppd.c:1.10 src/usr.bin/rfcomm_sppd/rfcomm_sppd.c:1.11
--- src/usr.bin/rfcomm_sppd/rfcomm_sppd.c:1.10 Tue May 12 18:43:35 2009
+++ src/usr.bin/rfcomm_sppd/rfcomm_sppd.c Thu May 21 14:44:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_sppd.c,v 1.10 2009/05/12 18:43:35 plunky Exp $ */
+/* $NetBSD: rfcomm_sppd.c,v 1.11 2009/05/21 14:44:01 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -62,7 +62,9 @@
Copyright (c) 2006 Itronix, Inc.\
Copyright (c) 2003 Maksim Yevmenkin m_evmen...@yahoo.com.\
All rights reserved.);
-__RCSID($NetBSD: rfcomm_sppd.c,v 1.10 2009/05/12 18:43:35 plunky Exp $);
+__RCSID($NetBSD: rfcomm_sppd.c,v 1.11 2009/05/21 14:44:01 plunky Exp $);
+
+#include sys/param.h
#include bluetooth.h
#include ctype.h
@@ -84,8 +86,6 @@
#include netbt/rfcomm.h
-#define max(a, b) ((a) (b) ? (a) : (b))
-
int open_tty(const char *);
int open_client(bdaddr_t *, bdaddr_t *, int, const char *);
int open_server(bdaddr_t *, uint8_t, int, const char *);
@@ -248,7 +248,7 @@
openlog(getprogname(), LOG_PERROR | LOG_PID, LOG_DAEMON);
syslog(LOG_INFO, Starting on %s..., (tty ? tty : stdio));
- n = max(tty_in, rfcomm) + 1;
+ n = MAX(tty_in, rfcomm) + 1;
while (!done) {
FD_ZERO(rdset);
FD_SET(tty_in, rdset);
CVS commit: src/sys/dev
Module Name:src
Committed By: dyoung
Date: Thu May 21 17:32:32 UTC 2009
Modified Files:
src/sys/dev/cardbus: cardslot.c
src/sys/dev/pci: pccbb.c
Log Message:
Let us detach pcmcia0 and cardbus0 at cardslot0, and cardslot0 at
cardbus0.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/cardbus/cardslot.c
cvs rdiff -u -r1.187 -r1.188 src/sys/dev/pci/pccbb.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/dev/cardbus/cardslot.c
diff -u src/sys/dev/cardbus/cardslot.c:1.49 src/sys/dev/cardbus/cardslot.c:1.50
--- src/sys/dev/cardbus/cardslot.c:1.49 Tue May 12 14:17:31 2009
+++ src/sys/dev/cardbus/cardslot.c Thu May 21 17:32:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.49 2009/05/12 14:17:31 cegger Exp $ */
+/* $NetBSD: cardslot.c,v 1.50 2009/05/21 17:32:32 dyoung Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cardslot.c,v 1.49 2009/05/12 14:17:31 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: cardslot.c,v 1.50 2009/05/21 17:32:32 dyoung Exp $);
#include opt_cardslot.h
@@ -64,6 +64,7 @@
+STATIC void cardslotchilddet(device_t, device_t);
STATIC void cardslotattach(device_t, device_t, void *);
STATIC int cardslotdetach(device_t, int);
@@ -76,7 +77,7 @@
const int *, void *);
CFATTACH_DECL3_NEW(cardslot, sizeof(struct cardslot_softc),
-cardslotmatch, cardslotattach, cardslotdetach, NULL, NULL, NULL,
+cardslotmatch, cardslotattach, cardslotdetach, NULL, NULL, cardslotchilddet,
DVF_DETACH_SHUTDOWN);
STATIC int
@@ -93,7 +94,19 @@
return 1;
}
+STATIC void
+cardslotchilddet(device_t self, device_t child)
+{
+ struct cardslot_softc *sc = device_private(self);
+ KASSERT(sc-sc_cb_softc == device_private(child) ||
+ sc-sc_16_softc == child);
+
+ if (sc-sc_cb_softc == device_private(child))
+ sc-sc_cb_softc = NULL;
+ else if (sc-sc_16_softc == child)
+ sc-sc_16_softc = NULL;
+}
STATIC void
cardslotattach(device_t parent, device_t self,
Index: src/sys/dev/pci/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.187 src/sys/dev/pci/pccbb.c:1.188
--- src/sys/dev/pci/pccbb.c:1.187 Wed May 6 09:25:16 2009
+++ src/sys/dev/pci/pccbb.c Thu May 21 17:32:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.187 2009/05/06 09:25:16 cegger Exp $ */
+/* $NetBSD: pccbb.c,v 1.188 2009/05/21 17:32:32 dyoung Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.187 2009/05/06 09:25:16 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.188 2009/05/21 17:32:32 dyoung Exp $);
/*
#define CBB_DEBUG
@@ -99,6 +99,7 @@
int pcicbbmatch(device_t, cfdata_t, void *);
void pccbbattach(device_t, device_t, void *);
+void pccbbchilddet(device_t, device_t);
int pccbbdetach(device_t, int);
int pccbbintr(void *);
static void pci113x_insert(void *);
@@ -212,7 +213,7 @@
#endif
CFATTACH_DECL3_NEW(cbb_pci, sizeof(struct pccbb_softc),
-pcicbbmatch, pccbbattach, pccbbdetach, NULL, NULL, NULL,
+pcicbbmatch, pccbbattach, pccbbdetach, NULL, NULL, pccbbchilddet,
DVF_DETACH_SHUTDOWN);
static const struct pcmcia_chip_functions pccbb_pcmcia_funcs = {
@@ -391,6 +392,20 @@
}
void
+pccbbchilddet(device_t self, device_t child)
+{
+ struct pccbb_softc *sc = device_private(self);
+ int s;
+
+ KASSERT(sc-sc_csc == device_private(child));
+
+ s = splbio();
+ if (sc-sc_csc == device_private(child))
+ sc-sc_csc = NULL;
+ splx(s);
+}
+
+void
pccbbattach(device_t parent, device_t self, void *aux)
{
struct pccbb_softc *sc = device_private(self);
@@ -1030,6 +1045,7 @@
pccbbintr(void *arg)
{
struct pccbb_softc *sc = (struct pccbb_softc *)arg;
+ struct cardslot_softc *csc;
u_int32_t sockevent, sockstate;
bus_space_tag_t memt = sc-sc_base_memt;
bus_space_handle_t memh = sc-sc_base_memh;
@@ -1087,14 +1103,16 @@
device_xname(sc-sc_dev), sockevent));
DPRINTF(( card removed, 0x%08x\n, sockstate));
sc-sc_flags = ~CBB_CARDEXIST;
-if (sc-sc_csc-sc_status
+if ((csc = sc-sc_csc) == NULL)
+ ;
+else if (csc-sc_status
CARDSLOT_STATUS_CARD_16) {
- cardslot_event_throw(sc-sc_csc,
+ cardslot_event_throw(csc,
CARDSLOT_EVENT_REMOVAL_16);
-} else if (sc-sc_csc-sc_status
+} else if (csc-sc_status
CARDSLOT_STATUS_CARD_CB) {
/* Cardbus intr removed */
- cardslot_event_throw(sc-sc_csc,
+ cardslot_event_throw(csc,
CARDSLOT_EVENT_REMOVAL_CB);
}
} else if (sc-sc_flags CBB_INSERTING) {
@@ -1148,6 +1166,7 @@
pci113x_insert(void *arg)
{
struct pccbb_softc *sc = arg;
+ struct cardslot_softc *csc;
u_int32_t sockevent, sockstate;
if (!(sc-sc_flags CBB_INSERTING)) {
@@ -1166,14 +1185,14 @@
DPRINTF(( card inserted, 0x%08x\n, sockstate));
sc-sc_flags |= CBB_CARDEXIST;
/* call
CVS commit: src/sys/conf
Module Name:src Committed By: wiz Date: Thu May 21 19:27:38 UTC 2009 Modified Files: src/sys/conf: majors Log Message: space - tab consistency. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.45 src/sys/conf/majors:1.46 --- src/sys/conf/majors:1.45 Thu Mar 12 00:15:07 2009 +++ src/sys/conf/majors Thu May 21 19:27:38 2009 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.45 2009/03/12 00:15:07 jmcneill Exp $ +# $NetBSD: majors,v 1.46 2009/05/21 19:27:38 wiz Exp $ # # Device majors for Machine-Independent drivers. # @@ -39,4 +39,4 @@ device-major tprof char 191 tprof device-major isv char 192 isv device-major video char 193 video -device-majordm char 194 block 169 dm +device-major dm char 194 block 169 dm
CVS commit: src/sys/arch/hp700/hp700
Module Name:src
Committed By: skrll
Date: Thu May 21 20:59:11 UTC 2009
Modified Files:
src/sys/arch/hp700/hp700: mainbus.c
Log Message:
Add mjf's d390 to the list of machines that need help finding devices.
hmm.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/hp700/hp700/mainbus.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/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.49 src/sys/arch/hp700/hp700/mainbus.c:1.50
--- src/sys/arch/hp700/hp700/mainbus.c:1.49 Fri May 8 09:33:58 2009
+++ src/sys/arch/hp700/hp700/mainbus.c Thu May 21 20:59:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.49 2009/05/08 09:33:58 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.50 2009/05/21 20:59:11 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.49 2009/05/08 09:33:58 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.50 2009/05/21 20:59:11 skrll Exp $);
#include locators.h
#include power.h
@@ -195,6 +195,7 @@
*/
*bshp = bpa;
+printf(%s: bpa 0x%016llx size 0x%016llx\n, __func__, (unsigned long long)bpa, (unsigned long long)size);
/*
* Loop while there is space left to map.
*/
@@ -229,7 +230,7 @@
/*
* Enter another single-page mapping.
*/
- pmap_kenter_pa(bpa, bpa, VM_PROT_READ | VM_PROT_WRITE);
+ pmap_kenter_pa(bpa, bpa, VM_PROT_READ | VM_PROT_WRITE | PMAP_NC);
bpa += PAGE_SIZE;
frames--;
}
@@ -1497,6 +1498,20 @@
bus_space_handle_t ioh;
hppa_hpa_t hpabase;
+ struct iomod_openbsd {
+/* SRS (Supervisor Register Set) */
+u_int io_eir; /* (WO) interrupt CPU; set bits in EIR CR */
+u_int io_eim; /* (WO) External Interrupt Message address */
+u_int io_dc_rw; /* write address of IODC to read IODC data */
+u_int io_ii_rw; /* read/clear external intrpt msg (bit-26) */
+u_int io_dma_link;/* pointer to next quad in DMA chain */
+u_int io_dma_command; /* (RO) chain command to exec on next quad */
+u_int io_dma_address; /* (RO) start of DMA */
+u_int io_dma_count; /* (RO) number of bytes remaining to xfer */
+u_int io_flex;/* (WO) HPA flex addr, LSB: bus master flag */
+ } *fred;
+
+
sc-sc_dv = self;
mb_attached = 1;
@@ -1521,8 +1536,19 @@
/*
* Local-Broadcast the HPA to all modules on the bus
*/
+#if 0
+ fred = (struct iomod_openbsd *)HPPA_LBCAST;
+
+fred-io_flex =
+ (pdc_hpa.hpa FLEX_MASK) | DMA_ENABLE;
+#else
+ fred = (struct iomod_openbsd *)HPPA_LBCAST;
+ printf(fred-io_flex %p\n, fred-io_flex);
((struct iomod *)(pdc_hpa.hpa FLEX_MASK))[FPA_IOMOD].io_flex =
(void *)((pdc_hpa.hpa FLEX_MASK) | DMA_ENABLE);
+#endif
+
+
sc-sc_hpa = pdc_hpa.hpa;
aprint_normal( [flex %lx]\n, pdc_hpa.hpa FLEX_MASK);
@@ -1568,6 +1594,7 @@
case HPPA_BOARD_HP785_C360:
case HPPA_BOARD_HP800D:
+ case HPPA_BOARD_HP821:
hpabase = HPPA_FPA;
break;
default:
CVS commit: src/sys/arch/hp700/conf
Module Name:src Committed By: skrll Date: Thu May 21 20:59:41 UTC 2009 Modified Files: src/sys/arch/hp700/conf: GENERIC Log Message: Add wax at uturn. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sys/arch/hp700/conf/GENERIC 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/hp700/conf/GENERIC diff -u src/sys/arch/hp700/conf/GENERIC:1.88 src/sys/arch/hp700/conf/GENERIC:1.89 --- src/sys/arch/hp700/conf/GENERIC:1.88 Fri May 8 09:33:57 2009 +++ src/sys/arch/hp700/conf/GENERIC Thu May 21 20:59:41 2009 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.88 2009/05/08 09:33:57 skrll Exp $ +# $NetBSD: GENERIC,v 1.89 2009/05/21 20:59:41 skrll Exp $ # # GENERIC machine description file # @@ -23,7 +23,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -#ident GENERIC-$Revision: 1.88 $ +#ident GENERIC-$Revision: 1.89 $ maxusers 32 # estimated number of users @@ -33,10 +33,10 @@ options HP7100LC_CPU # PCX-L options HP7200_CPU,HP7250_CPU # PCX-T' options HP7300LC_CPU # PCX-L2 -#options HP8000_CPU # PCX-U (in 32bit mode) -#options HP8200_CPU # PCX-V/U+ (in 32bit mode) -#options HP8500_CPU # PCX-W (in 32bit mode) -#options HP8600_CPU # PCX-W+ (in 32bit mode) +options HP8000_CPU # PCX-U (in 32bit mode) +options HP8200_CPU # PCX-V/U+ (in 32bit mode) +options HP8500_CPU # PCX-W (in 32bit mode) +options HP8600_CPU # PCX-W+ (in 32bit mode) # CPU-related options. options FPEMUL # floating point emulation XXX DO NOT REMOVE @@ -240,6 +240,7 @@ uturn1 at mainbus0 lasi* at uturn? # LASI on [CJ]* dino* at uturn? # PCI bus bridge +wax* at uturn? # Wax on [CD]* astro* at mainbus0 # Astro memory I/O controller # GSC bus support
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri May 22 00:06:11 UTC 2009 Modified Files: othersrc/usr.bin/tnftp: NEWS Log Message: Spell intermittent correctly To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 othersrc/usr.bin/tnftp/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/NEWS diff -u othersrc/usr.bin/tnftp/NEWS:1.4 othersrc/usr.bin/tnftp/NEWS:1.5 --- othersrc/usr.bin/tnftp/NEWS:1.4 Wed May 20 13:28:20 2009 +++ othersrc/usr.bin/tnftp/NEWS Fri May 22 00:06:11 2009 @@ -2,7 +2,7 @@ Changes in tnftp from 20070806 to 20090520: - Fix intermittant Alarm clock error. + Fix intermittent Alarm clock error. Add epsv6 and epsv to disable extended passive mode for IPv6 or both IPv4 and IPv6 respectively.
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri May 22 01:09:45 UTC 2009 Modified Files: othersrc/usr.bin/tnftp: configure.ac Log Message: Add the time.h headers to accheck_includes, for the strptime check. Remove the check for el_init in libedit; we're always replacing the library and the presence of strvis() in some versions confuses other checks. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/configure.ac diff -u othersrc/usr.bin/tnftp/configure.ac:1.17 othersrc/usr.bin/tnftp/configure.ac:1.18 --- othersrc/usr.bin/tnftp/configure.ac:1.17 Wed May 20 13:28:20 2009 +++ othersrc/usr.bin/tnftp/configure.ac Fri May 22 01:09:45 2009 @@ -1,10 +1,10 @@ -# $NetBSD: configure.ac,v 1.17 2009/05/20 13:28:20 lukem Exp $ +# $NetBSD: configure.ac,v 1.18 2009/05/22 01:09:45 lukem Exp $ # # Process this file with autoconf to produce a configure script. AC_INIT([tnftp], [20090520], [lu...@netbsd.org]) AC_PREREQ([2.61]) -AC_REVISION([$Revision: 1.17 $]) +AC_REVISION([$Revision: 1.18 $]) AS_SHELL_SANITIZE @@ -88,9 +88,7 @@ [], [AC_MSG_ERROR( [no relevant library found containing tgetent])]) - AC_SEARCH_LIBS([el_init], - [edit], - [have_libedit=yes], [have_libedit=no])]) + ]) AC_SEARCH_LIBS([gethostbyname], [nsl]) AC_SEARCH_LIBS([socket], @@ -137,6 +135,16 @@ # include stdlib.h # include string.h #endif +#if defined(TIME_WITH_SYS_TIME) +# include sys/time.h +# include time.h +#else +# if defined(HAVE_SYS_TIME_H) +# include sys/time.h +# else +# include time.h +# endif +#endif #if defined(HAVE_LIBGEN_H) # include libgen.h #endif
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Fri May 22 01:14:46 UTC 2009 Modified Files: othersrc/usr.bin/tnftp: ChangeLog Log Message: configure fixes To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 othersrc/usr.bin/tnftp/ChangeLog Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/ChangeLog diff -u othersrc/usr.bin/tnftp/ChangeLog:1.50 othersrc/usr.bin/tnftp/ChangeLog:1.51 --- othersrc/usr.bin/tnftp/ChangeLog:1.50 Wed May 20 13:50:57 2009 +++ othersrc/usr.bin/tnftp/ChangeLog Fri May 22 01:14:46 2009 @@ -1,7 +1,14 @@ -$NetBSD: ChangeLog,v 1.50 2009/05/20 13:50:57 lukem Exp $ +$NetBSD: ChangeLog,v 1.51 2009/05/22 01:14:46 lukem Exp $ +Fri May 22 01:11:15 UTC 2009 lukem -Wed May 20 13:47:43 UTC 2009 + * configure fixes: + - Add the time.h headers to accheck_includes, for the strptime check. + - Remove the check for el_init in libedit; we're always replacing + the library and the presence of strvis() in some versions + confuses other checks. + +Wed May 20 13:47:43 UTC 2009 lukem * Release as tnftp 20090520
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Fri May 22 02:28:54 UTC 2009 Modified Files: src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac tst src/crypto/external/bsd/netpgp/dist/src/bin: netpgp.1 netpgp.c src/crypto/external/bsd/netpgp/dist/src/lib: config.h packet.h version.h Log Message: CHANGES 1.99.2 - 1.99.3 + modified regression tests to make it easier to see status messages + modified --encrypt, --decrypt, --sign, and --clearsign as well as --cat to respect the --output argument for the output file. Default behaviour remains unchanged - if --output is not specified, standard file names and suffixes apply. Note that --verify has not been changed - this is for compatibility with gpg, POLA/POLS, and because --verify-cat/--cat provides this behaviour To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/netpgp/dist/TODO cvs rdiff -u -r1.9 -r1.10 src/crypto/external/bsd/netpgp/dist/configure \ src/crypto/external/bsd/netpgp/dist/configure.ac cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/tst cvs rdiff -u -r1.11 -r1.12 \ src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.1 cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/bin/netpgp.c cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/netpgp/dist/src/lib/config.h \ src/crypto/external/bsd/netpgp/dist/src/lib/version.h cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/packet.h 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/TODO diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.10 src/crypto/external/bsd/netpgp/dist/TODO:1.11 --- src/crypto/external/bsd/netpgp/dist/TODO:1.10 Thu May 21 00:35:01 2009 +++ src/crypto/external/bsd/netpgp/dist/TODO Fri May 22 02:28:54 2009 @@ -1,5 +1,6 @@ To Do = +new package for 1.99.3 separate verify program separate from libcrypto? 64-bit offsets Index: src/crypto/external/bsd/netpgp/dist/configure diff -u src/crypto/external/bsd/netpgp/dist/configure:1.9 src/crypto/external/bsd/netpgp/dist/configure:1.10 --- src/crypto/external/bsd/netpgp/dist/configure:1.9 Thu May 21 00:33:31 2009 +++ src/crypto/external/bsd/netpgp/dist/configure Fri May 22 02:28:54 2009 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for netpgp 20090520. +# Generated by GNU Autoconf 2.63 for netpgp 20090521. # # Report bugs to Alistair Crooks a...@netbsd.org c0596823. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='netpgp' PACKAGE_TARNAME='netpgp' -PACKAGE_VERSION='20090520' -PACKAGE_STRING='netpgp 20090520' +PACKAGE_VERSION='20090521' +PACKAGE_STRING='netpgp 20090521' PACKAGE_BUGREPORT='Alistair Crooks a...@netbsd.org c0596823' ac_unique_file=src/bin/netpgp.c @@ -1268,7 +1268,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat _ACEOF -\`configure' configures netpgp 20090520 to adapt to many kinds of systems. +\`configure' configures netpgp 20090521 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1338,7 +1338,7 @@ if test -n $ac_init_help; then case $ac_init_help in - short | recursive ) echo Configuration of netpgp 20090520:;; + short | recursive ) echo Configuration of netpgp 20090521:;; esac cat \_ACEOF @@ -1418,7 +1418,7 @@ test -n $ac_init_help exit $ac_status if $ac_init_version; then cat \_ACEOF -netpgp configure 20090520 +netpgp configure 20090521 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1432,7 +1432,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by netpgp $as_me 20090520, which was +It was created by netpgp $as_me 20090521, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -6161,7 +6161,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log= -This file was extended by netpgp $as_me 20090520, which was +This file was extended by netpgp $as_me 20090521, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -6220,7 +6220,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_version=\\ -netpgp config.status 20090520 +netpgp config.status 20090521 configured by $0, generated by GNU Autoconf 2.63, with options \\`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'`\\ Index: src/crypto/external/bsd/netpgp/dist/configure.ac diff -u src/crypto/external/bsd/netpgp/dist/configure.ac:1.9 src/crypto/external/bsd/netpgp/dist/configure.ac
