CVS commit: src/lib/libpuffs
Module Name:src
Committed By: manu
Date: Fri Jun 24 16:59:29 UTC 2011
Modified Files:
src/lib/libpuffs: null.c
Log Message:
Commit fix for misc/45029.
Approved by pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libpuffs/null.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpuffs/null.c
diff -u src/lib/libpuffs/null.c:1.28 src/lib/libpuffs/null.c:1.29
--- src/lib/libpuffs/null.c:1.28 Sun Oct 18 20:14:06 2009
+++ src/lib/libpuffs/null.c Fri Jun 24 16:59:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: null.c,v 1.28 2009/10/18 20:14:06 pooka Exp $ */
+/* $NetBSD: null.c,v 1.29 2011/06/24 16:59:29 manu Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: null.c,v 1.28 2009/10/18 20:14:06 pooka Exp $);
+__RCSID($NetBSD: null.c,v 1.29 2011/06/24 16:59:29 manu Exp $);
#endif /* !lint */
/*
@@ -410,21 +410,36 @@
struct puffs_node *pn = opc;
int fd, rv;
int fflags;
+ struct stat sb;
rv = 0;
- fd = writeableopen(PNPATH(pn));
- if (fd == -1)
+ if (stat(PNPATH(pn), sb) == -1)
return errno;
+ if (S_ISDIR(sb.st_mode)) {
+ DIR *dirp;
+ if ((dirp = opendir(PNPATH(pn))) == 0)
+ return errno;
+ fd = dirfd(dirp);
+ if (fd == -1)
+ return errno;
- if (how PUFFS_FSYNC_DATAONLY)
- fflags = FDATASYNC;
- else
- fflags = FFILESYNC;
- if (how PUFFS_FSYNC_CACHE)
- fflags |= FDISKSYNC;
+ if (fsync(fd) == -1)
+ rv = errno;
+ } else {
+ fd = writeableopen(PNPATH(pn));
+ if (fd == -1)
+ return errno;
- if (fsync_range(fd, fflags, offlo, offhi - offlo) == -1)
- rv = errno;
+ if (how PUFFS_FSYNC_DATAONLY)
+ fflags = FDATASYNC;
+ else
+ fflags = FFILESYNC;
+ if (how PUFFS_FSYNC_CACHE)
+ fflags |= FDISKSYNC;
+
+ if (fsync_range(fd, fflags, offlo, offhi - offlo) == -1)
+ rv = errno;
+ }
close(fd);
CVS commit: src/usr.bin/sdpquery
Module Name:src
Committed By: plunky
Date: Fri Jun 24 19:03:47 UTC 2011
Modified Files:
src/usr.bin/sdpquery: print.c
Log Message:
interpret Hardcopy Cable Replacement Profile attributes
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/sdpquery/print.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/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.9 src/usr.bin/sdpquery/print.c:1.10
--- src/usr.bin/sdpquery/print.c:1.9 Fri Jun 24 18:50:32 2011
+++ src/usr.bin/sdpquery/print.c Fri Jun 24 19:03:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.9 2011/06/24 18:50:32 plunky Exp $ */
+/* $NetBSD: print.c,v 1.10 2011/06/24 19:03:46 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: print.c,v 1.9 2011/06/24 18:50:32 plunky Exp $);
+__RCSID($NetBSD: print.c,v 1.10 2011/06/24 19:03:46 plunky Exp $);
#include ctype.h
#include iconv.h
@@ -303,6 +303,13 @@
{ 0x020e, HIDBootDevice, print_bool },
};
+attr_t hcr_attrs[] = { /* Hardcopy Cable Replacement */
+ { 0x0300, 1284ID,print_string },
+ { 0x0302, DeviceName,print_string },
+ { 0x0304, FriendlyName, print_string },
+ { 0x0306, DeviceLocation, print_string },
+};
+
attr_t pnp_attrs[] = { /* Device ID */
{ 0x0200, SpecificationID, print_profile_version },
{ 0x0201, VendorID,print_uint16x },
@@ -363,8 +370,8 @@
{ 0x1123, Printing Status, NULL, 0 },
{ 0x1124, Human Interface Device, A(hid_attrs) },
{ 0x1125, Hardcopy Cable Replacement, NULL, 0 },
- { 0x1126, Hardcopy Cable Replacement Print, NULL, 0 },
- { 0x1127, Hardcopy Cable Replacement Scan, NULL, 0 },
+ { 0x1126, Hardcopy Cable Replacement Print, A(hcr_attrs) },
+ { 0x1127, Hardcopy Cable Replacement Scan, A(hcr_attrs) },
{ 0x1128, Common ISDN Access, NULL, 0 },
{ 0x1129, Video Conferencing GW, NULL, 0 },
{ 0x112a, UDI MT,NULL, 0 },
CVS commit: src/usr.bin/sdpquery
Module Name:src
Committed By: plunky
Date: Fri Jun 24 20:06:04 UTC 2011
Modified Files:
src/usr.bin/sdpquery: print.c
Log Message:
if print_attribute() did not print, we should try the next
service_class before failing
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/sdpquery/print.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/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.10 src/usr.bin/sdpquery/print.c:1.11
--- src/usr.bin/sdpquery/print.c:1.10 Fri Jun 24 19:03:46 2011
+++ src/usr.bin/sdpquery/print.c Fri Jun 24 20:06:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.10 2011/06/24 19:03:46 plunky Exp $ */
+/* $NetBSD: print.c,v 1.11 2011/06/24 20:06:04 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: print.c,v 1.10 2011/06/24 19:03:46 plunky Exp $);
+__RCSID($NetBSD: print.c,v 1.11 2011/06/24 20:06:04 plunky Exp $);
#include ctype.h
#include iconv.h
@@ -646,10 +646,10 @@
for (i = 0; i nservices; i++) {
for (j = 0; j __arraycount(service_list); j++) {
- if (service_class[i] == service_list[j].class)
-return print_attribute(id, value,
-service_list[j].attrs,
-service_list[j].nattr);
+ if (service_class[i] == service_list[j].class
+ print_attribute(id, value,
+ service_list[j].attrs, service_list[j].nattr))
+return true;
}
}
CVS commit: src/usr.bin/sdpquery
Module Name:src
Committed By: plunky
Date: Fri Jun 24 20:11:23 UTC 2011
Modified Files:
src/usr.bin/sdpquery: print.c
Log Message:
in the Basic Printing Profile it is not really very clear
which ServiceClass the attributes relate to, so link them
to Direct Printing and Printer Status as well as
Reference Printing, since I have a printer (HP460) which
does not claim the latter.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/sdpquery/print.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/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.11 src/usr.bin/sdpquery/print.c:1.12
--- src/usr.bin/sdpquery/print.c:1.11 Fri Jun 24 20:06:04 2011
+++ src/usr.bin/sdpquery/print.c Fri Jun 24 20:11:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.11 2011/06/24 20:06:04 plunky Exp $ */
+/* $NetBSD: print.c,v 1.12 2011/06/24 20:11:23 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: print.c,v 1.11 2011/06/24 20:06:04 plunky Exp $);
+__RCSID($NetBSD: print.c,v 1.12 2011/06/24 20:11:23 plunky Exp $);
#include ctype.h
#include iconv.h
@@ -356,7 +356,7 @@
{ 0x1115, Personal Area Networking User, A(panu_attrs) },
{ 0x1116, Network Access Point, A(nap_attrs) },
{ 0x1117, Group Network, A(gn_attrs) },
- { 0x1118, Direct Printing, NULL, 0 },
+ { 0x1118, Direct Printing, A(bp_attrs) },
{ 0x1119, Reference Printing, A(bp_attrs) },
{ 0x111a, Imaging,NULL, 0 },
{ 0x111b, Imaging Responder, A(bi_attrs) },
@@ -367,7 +367,7 @@
{ 0x1120, Direct Printing Reference Objects, NULL, 0 },
{ 0x1121, Reflected User Interface, A(rui_attrs) },
{ 0x1122, Basic Printing, NULL, 0 },
- { 0x1123, Printing Status, NULL, 0 },
+ { 0x1123, Printing Status, A(bp_attrs) },
{ 0x1124, Human Interface Device, A(hid_attrs) },
{ 0x1125, Hardcopy Cable Replacement, NULL, 0 },
{ 0x1126, Hardcopy Cable Replacement Print, A(hcr_attrs) },
CVS commit: src/usr.bin/sdpquery
Module Name:src
Committed By: plunky
Date: Fri Jun 24 20:53:56 UTC 2011
Modified Files:
src/usr.bin/sdpquery: print.c
Log Message:
some attributes contain comma separated lists which are too long to
show on a single line, split them up
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/sdpquery/print.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/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.12 src/usr.bin/sdpquery/print.c:1.13
--- src/usr.bin/sdpquery/print.c:1.12 Fri Jun 24 20:11:23 2011
+++ src/usr.bin/sdpquery/print.c Fri Jun 24 20:53:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.12 2011/06/24 20:11:23 plunky Exp $ */
+/* $NetBSD: print.c,v 1.13 2011/06/24 20:53:56 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: print.c,v 1.12 2011/06/24 20:11:23 plunky Exp $);
+__RCSID($NetBSD: print.c,v 1.13 2011/06/24 20:53:56 plunky Exp $);
#include ctype.h
#include iconv.h
@@ -82,6 +82,7 @@
static void print_uuid(sdp_data_t *);
static void print_uuid_list(sdp_data_t *);
static void print_string(sdp_data_t *);
+static void print_string_list(sdp_data_t *);
static void print_url(sdp_data_t *);
static void print_profile_version(sdp_data_t *);
static void print_language_string(sdp_data_t *);
@@ -244,19 +245,19 @@
};
attr_t bp_attrs[] = { /* Basic Printing */
- { 0x0350, DocumentFormatsSupported, print_string },
+ { 0x0350, DocumentFormatsSupported, print_string_list },
{ 0x0352, CharacterRepertoiresSupported, print_character_repertoires },
- { 0x0354, XHTML-PrintImageFormatsSupported, print_string },
+ { 0x0354, XHTML-PrintImageFormatsSupported, print_string_list },
{ 0x0356, ColorSupported, print_bool },
{ 0x0358, 1284ID,print_string },
{ 0x035a, PrinterName, print_string },
{ 0x035c, PrinterLocation, print_string },
{ 0x035e, DuplexSupported, print_bool },
- { 0x0360, MediaTypesSupported, print_string },
+ { 0x0360, MediaTypesSupported, print_string_list },
{ 0x0362, MaxMediaWidth, print_uint16d },
{ 0x0364, MaxMediaLength, print_uint16d },
{ 0x0366, EnhancedLayoutSupport, print_bool },
- { 0x0368, RUIFormatsSupported, print_string },
+ { 0x0368, RUIFormatsSupported, print_string_list },
{ 0x0370, ReferencePrintingRUISupported, print_bool },
{ 0x0372, DirectPrintingRUISupported, print_bool },
{ 0x0374, ReferencePrintingTopURL, print_url },
@@ -281,7 +282,7 @@
};
attr_t rui_attrs[] = { /* Reflected User Interface */
- { 0x0368, RUIFormatsSupported, print_string },
+ { 0x0368, RUIFormatsSupported, print_string_list },
{ 0x0378, PrinterAdminRUITopURL, print_url },
};
@@ -774,6 +775,31 @@
}
static void
+print_string_list(sdp_data_t *data)
+{
+ char *str, *ep;
+ size_t len, l;
+
+ if (!sdp_get_str(data, str, len))
+ return;
+
+ printf(\n);
+ while (len 0) {
+ ep = memchr(str, (int)',', len);
+ if (ep == NULL) {
+ l = len;
+ len = 0;
+ } else {
+ l = (size_t)(ep - str);
+ len -= l + 1;
+ ep++;
+ }
+ printf(%s\n, string_vis(VIS_CSTYLE, str, l));
+ str = ep;
+ }
+}
+
+static void
print_url(sdp_data_t *data)
{
char *url;
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: matt Date: Fri Jun 24 22:19:45 UTC 2011 Modified Files: src/sys/arch/powerpc/powerpc: powerpc_machdep.c Log Message: Fix code that's been broken for over seven years... To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/powerpc/powerpc/powerpc_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/powerpc/powerpc/powerpc_machdep.c diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.57 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.58 --- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.57 Tue Jun 21 06:32:36 2011 +++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Fri Jun 24 22:19:45 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: powerpc_machdep.c,v 1.57 2011/06/21 06:32:36 matt Exp $ */ +/* $NetBSD: powerpc_machdep.c,v 1.58 2011/06/24 22:19:45 matt Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.57 2011/06/21 06:32:36 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: powerpc_machdep.c,v 1.58 2011/06/24 22:19:45 matt Exp $); #include opt_altivec.h #include opt_modular.h @@ -159,7 +159,7 @@ struct sysctlnode node = *rnode; if (powersave 0) - node.sysctl_flags |= ~CTLFLAG_READWRITE; + node.sysctl_flags = ~CTLFLAG_READWRITE; return (sysctl_lookup(SYSCTLFN_CALL(node))); } #endif
CVS commit: src/sys/arch
Module Name:src
Committed By: matt
Date: Sat Jun 25 00:07:10 UTC 2011
Modified Files:
src/sys/arch/evbppc/mpc85xx: machdep.c
src/sys/arch/powerpc/booke: e500_intr.c e500_timer.c
Log Message:
Make powerpc work on BookE. At this time we only support DOZE (lightest
form of power-saving). By default, power-saving is disabled but can be
enabled in /etc/sysctl.conf by setting machdep.powersave=1
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/booke/e500_intr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/e500_timer.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/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.12 src/sys/arch/evbppc/mpc85xx/machdep.c:1.13
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.12 Thu Jun 23 01:27:20 2011
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Sat Jun 25 00:07:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.12 2011/06/23 01:27:20 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.13 2011/06/25 00:07:10 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -752,7 +752,7 @@
msr = wrtee(0);
hid0 = mfspr(SPR_HID0);
- hid0 = (hid0 ~HID0_TBEN) | HID0_DOZE;
+ hid0 = (hid0 ~(HID0_TBEN|HID0_NAP|HID0_SLEEP)) | HID0_DOZE;
mtspr(SPR_HID0, hid0);
msr = (msr ~(PSL_EE|PSL_CE|PSL_ME)) | PSL_WE;
@@ -778,8 +778,13 @@
printf( initppc(%#PRIxVADDR, %#PRIxVADDR, %p, %p, %p, %p)enter,
startkernel, endkernel, a0, a1, a2, a3);
+ /*
+ * Make sure we don't enter NAP or SLEEP if PSL_POW (MSR[WE]) is set.
+ * DOZE is ok.
+ */
const register_t hid0 = mfspr(SPR_HID0);
- mtspr(SPR_HID0, hid0 | HID0_TBEN | HID0_EMCP);
+ mtspr(SPR_HID0,
+ (hid0 ~(HID0_NAP | HID0_SLEEP)) | HID0_TBEN | HID0_EMCP | HID0_DOZE);
#ifdef CADMUS
/*
* Need to cache this from cadmus since we need to unmap cadmus since
@@ -1064,6 +1069,8 @@
struct cpu_info * const ci = curcpu();
const uint16_t svr = getsvr();
+ powersave = 0; /* we can do it but turn it on by default */
+
booke_cpu_startup(socname(mfspr(SPR_SVR)));
uint32_t v = cpu_read_4(GLOBAL_BASE + PORPLLSR);
Index: src/sys/arch/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.12 src/sys/arch/powerpc/booke/e500_intr.c:1.13
--- src/sys/arch/powerpc/booke/e500_intr.c:1.12 Tue Jun 21 06:24:25 2011
+++ src/sys/arch/powerpc/booke/e500_intr.c Sat Jun 25 00:07:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.12 2011/06/21 06:24:25 matt Exp $ */
+/* $NetBSD: e500_intr.c,v 1.13 2011/06/25 00:07:10 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -444,6 +444,7 @@
e500_splset(struct cpu_info *ci, int ipl)
{
struct cpu_softc * const cpu = ci-ci_softc;
+
//KASSERT(!cpu_intr_p() || ipl = IPL_VM);
KASSERT((curlwp-l_pflag LP_INTR) == 0 || ipl != IPL_NONE);
#if 0
@@ -454,7 +455,7 @@
u_int ctpr = (ipl = IPL_VM ? 15 : ipl);
KASSERT(openpic_read(cpu, OPENPIC_CTPR) == old_ctpr);
#else
- u_int ctpr = IPL2CTPR(ipl);
+ const u_int ctpr = IPL2CTPR(ipl);
KASSERT(openpic_read(cpu, OPENPIC_CTPR) == IPL2CTPR(ci-ci_cpl));
#endif
openpic_write(cpu, OPENPIC_CTPR, ctpr);
@@ -951,6 +952,13 @@
e500_splset(ci, old_ipl); /* and drop back */
#endif
+ /*
+ * If we interrupted while power-saving and we need to exit idle,
+ * we need to clear PSL_POW so we won't go back into power-saving.
+ */
+ if (__predict_false(tf-tf_srr1 PSL_POW) ci-ci_want_resched)
+ tf-tf_srr1 = ~PSL_POW;
+
// printf(%s(%p): idepth=%d exit\n, __func__, tf, ci-ci_idepth);
}
@@ -1047,6 +1055,9 @@
(%s: cpu%u: CTPR (%d) != IPL_NONE, __func__, cpu_number(),
CTPR2IPL(openpic_read(curcpu()-ci_softc, OPENPIC_CTPR;
KASSERT(mfmsr() PSL_EE);
+
+ if (powersave 0)
+ mtmsr(mfmsr() | PSL_POW);
}
static void
Index: src/sys/arch/powerpc/booke/e500_timer.c
diff -u src/sys/arch/powerpc/booke/e500_timer.c:1.2 src/sys/arch/powerpc/booke/e500_timer.c:1.3
--- src/sys/arch/powerpc/booke/e500_timer.c:1.2 Tue Jan 18 01:02:52 2011
+++ src/sys/arch/powerpc/booke/e500_timer.c Sat Jun 25 00:07:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_timer.c,v 1.2 2011/01/18 01:02:52 matt Exp $ */
+/* $NetBSD: e500_timer.c,v 1.3 2011/06/25 00:07:10 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: e500_timer.c,v 1.2 2011/01/18 01:02:52 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: e500_timer.c,v 1.3 2011/06/25 00:07:10 matt Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -153,6 +153,8 @@
wrtee(0); /* turn off interrupts */
+ tf-tf_srr1 = ~PSL_POW; /* make cpu_idle exit */
+
return 1;
}
CVS commit: src/crypto/external/bsd/netpgp
Module Name:src
Committed By: agc
Date: Sat Jun 25 00:37:45 UTC 2011
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c netpgp.c
packet-print.c
src/crypto/external/bsd/netpgp/dist/src/libmj: libmj.3 mj.c mj.h
src/crypto/external/bsd/netpgp/libmj: shlib_version
Log Message:
change mj library to take an additional argument for a string type,
denoting its length. this allows binary strings to be encoded using
libmj.
escape magic characters in json strings in a more efficient manner.
the previous method was not scalable.
update callers to suit
bump libmj major version number
add examples to the libmj(3) man page
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 \
src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c
cvs rdiff -u -r1.89 -r1.90 \
src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
cvs rdiff -u -r1.40 -r1.41 \
src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/netpgp/dist/src/libmj/libmj.3
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.h
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/libmj/shlib_version
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/lib/keyring.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.49 src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.50
--- src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c:1.49 Mon Nov 15 08:50:32 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c Sat Jun 25 00:37:44 2011
@@ -57,7 +57,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: keyring.c,v 1.49 2010/11/15 08:50:32 agc Exp $);
+__RCSID($NetBSD: keyring.c,v 1.50 2011/06/25 00:37:44 agc Exp $);
#endif
#ifdef HAVE_FCNTL_H
@@ -1039,7 +1039,7 @@
if (pgp_get_debug_level(__FILE__)) {
char *s;
- mj_asprint(s, obj);
+ mj_asprint(s, obj, MJ_JSON_ENCODE);
(void) fprintf(stderr, pgp_keyring_json: '%s'\n, s);
free(s);
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.89 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.90
--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.89 Mon Jan 3 05:34:53 2011
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Sat Jun 25 00:37:44 2011
@@ -34,7 +34,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: netpgp.c,v 1.89 2011/01/03 05:34:53 agc Exp $);
+__RCSID($NetBSD: netpgp.c,v 1.90 2011/06/25 00:37:44 agc Exp $);
#endif
#include sys/types.h
@@ -509,7 +509,8 @@
static void
pobj(FILE *fp, mj_t *obj, int depth)
{
- unsigned i;
+ unsigned i;
+ char *s;
if (obj == NULL) {
(void) fprintf(stderr, No object found\n);
@@ -528,7 +529,10 @@
p(fp, obj-value.s, NULL);
break;
case MJ_STRING:
- (void) fprintf(fp, %.*s, (int)(obj-c), obj-value.s);
+ if ((i = mj_asprint(s, obj, MJ_HUMAN)) 2) {
+ (void) fprintf(fp, %.*s, (int)i - 2, s[1]);
+ free(s);
+ }
break;
case MJ_ARRAY:
for (i = 0 ; i obj-c ; i++) {
@@ -582,7 +586,7 @@
int i;
if (pgp_get_debug_level(__FILE__)) {
- mj_asprint(s, obj);
+ mj_asprint(s, obj, MJ_HUMAN);
(void) fprintf(stderr, formatobj: json is '%s'\n, s);
free(s);
}
@@ -919,7 +923,7 @@
return pgp_keyring_list(netpgp-io, netpgp-pubring, psigs);
}
-/* list the keys in a keyring, returning a JSON string */
+/* list the keys in a keyring, returning a JSON encoded string */
int
netpgp_list_keys_json(netpgp_t *netpgp, char **json, const int psigs)
{
@@ -935,7 +939,7 @@
(void) fprintf(stderr, No keys in keyring\n);
return 0;
}
- ret = mj_asprint(json, obj);
+ ret = mj_asprint(json, obj, MJ_JSON_ENCODE);
mj_delete(obj);
return ret;
}
@@ -1033,7 +1037,7 @@
k += 1;
}
} while (key != NULL);
- ret = mj_asprint(json, id_array);
+ ret = mj_asprint(json, id_array, MJ_JSON_ENCODE);
mj_delete(id_array);
return ret;
}
Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c
diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.40 src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.41
--- src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.40 Mon Nov 15 08:50:32 2010
+++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c Sat Jun 25 00:37:44 2011
@@ -58,7 +58,7 @@
#if defined(__NetBSD__)
__COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: packet-print.c,v 1.40 2010/11/15 08:50:32 agc Exp $);
+__RCSID($NetBSD: packet-print.c,v 1.41 2011/06/25 00:37:44 agc Exp $);
#endif
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: agc Date: Sat Jun 25 00:42:58 UTC 2011 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi Log Message: libmj major number bump To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.117 -r1.118 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.587 -r1.588 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.53 src/distrib/sets/lists/base/ad.mips64eb:1.54 --- src/distrib/sets/lists/base/ad.mips64eb:1.53 Mon Jun 6 16:16:00 2011 +++ src/distrib/sets/lists/base/ad.mips64eb Sat Jun 25 00:42:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.53 2011/06/06 16:16:00 njoly Exp $ +# $NetBSD: ad.mips64eb,v 1.54 2011/06/25 00:42:57 agc Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -157,8 +157,8 @@ ./usr/lib/64/libmagic.so.3.1 base-compat-shlib compat,pic ./usr/lib/64/libmenu.so.6 base-compat-shlib compat,pic ./usr/lib/64/libmenu.so.6.0 base-compat-shlib compat,pic -./usr/lib/64/libmj.so.0base-compat-shlib compat,pic,crypto -./usr/lib/64/libmj.so.0.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libmj.so.1base-compat-shlib compat,pic,crypto +./usr/lib/64/libmj.so.1.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnetpgp.so.3 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnetpgp.so.3.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnpf.so.0 base-compat-shlib compat,pic,npf @@ -434,8 +434,8 @@ ./usr/lib/o32/libmagic.so.3.1 base-compat-shlib compat,pic ./usr/lib/o32/libmenu.so.6 base-compat-shlib compat,pic ./usr/lib/o32/libmenu.so.6.0 base-compat-shlib compat,pic -./usr/lib/o32/libmj.so.0 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libmj.so.0.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libmj.so.1 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libmj.so.1.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libnetpgp.so.3 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libnetpgp.so.3.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libnpf.so.0 base-compat-shlib compat,pic,npf Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.50 src/distrib/sets/lists/base/ad.mips64el:1.51 --- src/distrib/sets/lists/base/ad.mips64el:1.50 Mon Jun 6 16:16:00 2011 +++ src/distrib/sets/lists/base/ad.mips64el Sat Jun 25 00:42:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.50 2011/06/06 16:16:00 njoly Exp $ +# $NetBSD: ad.mips64el,v 1.51 2011/06/25 00:42:58 agc Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -157,8 +157,8 @@ ./usr/lib/64/libmagic.so.3.1 base-compat-shlib compat,pic ./usr/lib/64/libmenu.so.6 base-compat-shlib compat,pic ./usr/lib/64/libmenu.so.6.0 base-compat-shlib compat,pic -./usr/lib/64/libmj.so.0base-compat-shlib compat,pic,crypto -./usr/lib/64/libmj.so.0.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libmj.so.1base-compat-shlib compat,pic,crypto +./usr/lib/64/libmj.so.1.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnetpgp.so.3 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnetpgp.so.3.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libnpf.so.0 base-compat-shlib compat,pic,npf @@ -434,8 +434,8 @@ ./usr/lib/o32/libmagic.so.3.1 base-compat-shlib compat,pic ./usr/lib/o32/libmenu.so.6 base-compat-shlib compat,pic ./usr/lib/o32/libmenu.so.6.0 base-compat-shlib compat,pic -./usr/lib/o32/libmj.so.0 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libmj.so.0.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libmj.so.1 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libmj.so.1.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libnetpgp.so.3 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libnetpgp.so.3.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libnpf.so.0 base-compat-shlib compat,pic,npf Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.124 src/distrib/sets/lists/base/md.amd64:1.125 --- src/distrib/sets/lists/base/md.amd64:1.124 Sun Jun 5 23:09:51 2011 +++ src/distrib/sets/lists/base/md.amd64 Sat Jun 25 00:42:58 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.124 2011/06/05 23:09:51 spz Exp $ +# $NetBSD: md.amd64,v 1.125 2011/06/25 00:42:58 agc Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0
CVS commit: src/sys/arch
Module Name:src
Committed By: matt
Date: Sat Jun 25 02:26:53 UTC 2011
Modified Files:
src/sys/arch/evbppc/conf: Makefile.evbppc.inc
src/sys/arch/powerpc/conf: Makefile.powerpc
Log Message:
Move some stuff from evbppc's Makefile.inc to powerpc's.
This avoids redundant objcopy's
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/conf/Makefile.evbppc.inc
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/conf/Makefile.powerpc
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/evbppc/conf/Makefile.evbppc.inc
diff -u src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.7 src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.8
--- src/sys/arch/evbppc/conf/Makefile.evbppc.inc:1.7 Tue Jun 14 05:31:33 2011
+++ src/sys/arch/evbppc/conf/Makefile.evbppc.inc Sat Jun 25 02:26:53 2011
@@ -1,49 +1,7 @@
-# $NetBSD: Makefile.evbppc.inc,v 1.7 2011/06/14 05:31:33 matt Exp $
+# $NetBSD: Makefile.evbppc.inc,v 1.8 2011/06/25 02:26:53 matt Exp $
CPPFLAGS += -D__${BOARDTYPE}__
RAMDISKDIR!= cd ${NETBSDSRCDIR}/distrib/${THISPPC:T}/ramdisk ${PRINTOBJDIR}
-.if defined(NEED_MDSETIMAGE) $(NEED_MDSETIMAGE) != no \
- exists(${RAMDISKDIR}/ramdisk.fs)
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
- ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
-.endif
-
-.if defined(NEED_SREC) ${NEED_SREC} != no
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${STRIP} -O srec -o $@.srec $@; \
- ${STRIP} -O srec -o $@.srec $@
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@}
-.endif
-
-.if defined(NEED_BINARY) ${NEED_BINARY} != no
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${OBJCOPY} -S -O binary $@ $@.bin; \
- ${OBJCOPY} -S -O binary $@ $@.bin
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
-
-.if defined(NEED_UBOOTIMAGE) ${NEED_UBOOTIMAGE} != no
-_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
-MKUBOOTIMAGEARGS= -A powerpc -T kernel -C gz
-MKUBOOTIMAGEARGS+= -a ${TEXTADDR:C/$//} -e $(TEXTADDR)
-MKUBOOTIMAGEARGS+= -n NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))
-
-.if defined(USE_PIGZGZIP) ${USE_PIGZGZIP} != no
-TOOL_GZIP?= ${TOOL_PIGZ}
-.endif
-TOOL_GZIP?= gzip
-SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${TOOL_GZIP} -9cn $@.bin '' $@.bin.gz; \
- ${TOOL_GZIP} -9cn $@.bin $@.bin.gz; \
- echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub; \
- ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub
-
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
-EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
-.endif
-.endif
-
.-include ${THISPPC}/conf/Makefile.${BOARDTYPE}.inc
Index: src/sys/arch/powerpc/conf/Makefile.powerpc
diff -u src/sys/arch/powerpc/conf/Makefile.powerpc:1.46 src/sys/arch/powerpc/conf/Makefile.powerpc:1.47
--- src/sys/arch/powerpc/conf/Makefile.powerpc:1.46 Sat Jun 18 21:17:29 2011
+++ src/sys/arch/powerpc/conf/Makefile.powerpc Sat Jun 25 02:26:53 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.powerpc,v 1.46 2011/06/18 21:17:29 matt Exp $
+# $NetBSD: Makefile.powerpc,v 1.47 2011/06/25 02:26:53 matt Exp $
#
# Makefile for NetBSD
#
@@ -80,16 +80,45 @@
ENTRYPOINT= __start
-.if defined(NEED_SREC)
+.if defined(NEED_MDSETIMAGE) $(NEED_MDSETIMAGE) != no \
+ defined(RAMDISKDIR) exists(${RAMDISKDIR}/ramdisk.fs)
SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${OBJCOPY} -O srec $@ $@.srec; \
- ${OBJCOPY} -O srec $@ $@.srec
+ echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
+ ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
.endif
-.if defined(NEED_BINARY)
+.if defined(NEED_SREC) ${NEED_SREC} != no
SYSTEM_LD_TAIL_EXTRA+=; \
- echo ${OBJCOPY} -O binary $@ $@.bin; \
- ${OBJCOPY} -O binary $@ $@.bin
+ echo ${OBJCOPY} -O srec $@ $@.srec; \
+ ${OBJCOPY} -O srec $@ $@.srec
+.endif
+
+.if defined(NEED_BINARY) ${NEED_BINARY} != no
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${OBJCOPY} -S -O binary $@ $@.bin; \
+ ${OBJCOPY} -S -O binary $@ $@.bin
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+
+.if defined(NEED_UBOOTIMAGE) ${NEED_UBOOTIMAGE} != no
+_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
+MKUBOOTIMAGEARGS= -A powerpc -T kernel -C gz
+MKUBOOTIMAGEARGS+= -a ${TEXTADDR:C/$//} -e $(TEXTADDR)
+MKUBOOTIMAGEARGS+= -n NetBSD/$(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))
+
+.if defined(USE_PIGZGZIP) ${USE_PIGZGZIP} != no
+TOOL_GZIP?= ${TOOL_PIGZ}
+.endif
+TOOL_GZIP?= gzip
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${TOOL_GZIP} -9cn $@.bin '' $@.bin.gz; \
+ ${TOOL_GZIP} -9cn $@.bin $@.bin.gz; \
+ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub; \
+ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin.gz $@.ub
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+.endif
.endif
##
CVS commit: src/doc
Module Name:src Committed By: nonaka Date: Sat Jun 25 05:50:14 UTC 2011 Modified Files: src/doc: CHANGES Log Message: ld.elf_so(1): Support ELF symbol versioning. To generate a diff of this commit: cvs rdiff -u -r1.1570 -r1.1571 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1570 src/doc/CHANGES:1.1571 --- src/doc/CHANGES:1.1570 Tue Jun 21 01:53:18 2011 +++ src/doc/CHANGES Sat Jun 25 05:50:14 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1570 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1571 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1046,3 +1046,4 @@ GMP: Import GNU MP 5.0.2. [mrg 20110619] sandpoint: Add support for booting from RAID 1 [jdc 20110620] GCC: Import version 4.5.3. [mrg 20110620] + ld.elf_so(1): Support ELF symbol versioning. [nonaka 20110625]
