CVS commit: src/gnu/usr.bin/send-pr
Module Name:src Committed By: wiz Date: Fri Dec 21 09:40:18 UTC 2012 Modified Files: src/gnu/usr.bin/send-pr: Makefile Log Message: Set GNATS_ADDR to gnats-b...@netbsd.org, like in all other places. Ok spz for admins. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/gnu/usr.bin/send-pr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/send-pr/Makefile diff -u src/gnu/usr.bin/send-pr/Makefile:1.30 src/gnu/usr.bin/send-pr/Makefile:1.31 --- src/gnu/usr.bin/send-pr/Makefile:1.30 Sat Oct 25 22:27:35 2008 +++ src/gnu/usr.bin/send-pr/Makefile Fri Dec 21 09:40:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2008/10/25 22:27:35 apb Exp $ +# $NetBSD: Makefile,v 1.31 2012/12/21 09:40:17 wiz Exp $ .include bsd.own.mk @@ -19,7 +19,7 @@ VERSION=3.95 GNATS_ROOT = # Email address to which people should submit bugs. -GNATS_ADDR = gnats-b...@gnats.netbsd.org +GNATS_ADDR = gnats-b...@netbsd.org # The default release for this send-pr. DEFAULT_RELEASE = `uname -s` `uname -r`
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: christos
Date: Fri Dec 21 18:07:37 UTC 2012
Modified Files:
src/usr.bin/ftp: Makefile fetch.c ftp_var.h main.c
Added Files:
src/usr.bin/ftp: ssl.c ssl.h
Log Message:
PR/47276: Add https support
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/ftp/Makefile
cvs rdiff -u -r1.198 -r1.199 src/usr.bin/ftp/fetch.c
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/ftp/ftp_var.h
cvs rdiff -u -r1.120 -r1.121 src/usr.bin/ftp/main.c
cvs rdiff -u -r0 -r1.1 src/usr.bin/ftp/ssl.c src/usr.bin/ftp/ssl.h
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/ftp/Makefile
diff -u src/usr.bin/ftp/Makefile:1.35 src/usr.bin/ftp/Makefile:1.36
--- src/usr.bin/ftp/Makefile:1.35 Sun Aug 14 08:58:15 2011
+++ src/usr.bin/ftp/Makefile Fri Dec 21 13:07:36 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/08/14 12:58:15 christos Exp $
+# $NetBSD: Makefile,v 1.36 2012/12/21 18:07:36 christos Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/3/94
.include bsd.own.mk
@@ -18,6 +18,12 @@ CPPFLAGS+=-DNO_EDITCOMPLETE -DNO_ABOUT -
.else
LDADD+= -ledit -lterminfo
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+.if (${MKCRYPTO} != no)
+CPPFLAGS+= -DWITH_SSL
+SRCS+=ssl.c
+LDADD+= -lssl -lcrypto
+DPADD+= ${LIBSSL} ${LIBCRYPTO}
+.endif
.endif
.if (!defined(SMALLPROG) || defined(SMALLPROG_INET6)) (${USE_INET6} != no)
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.198 src/usr.bin/ftp/fetch.c:1.199
--- src/usr.bin/ftp/fetch.c:1.198 Wed Jul 4 02:09:37 2012
+++ src/usr.bin/ftp/fetch.c Fri Dec 21 13:07:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.198 2012/07/04 06:09:37 is Exp $ */
+/* $NetBSD: fetch.c,v 1.199 2012/12/21 18:07:36 christos Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fetch.c,v 1.198 2012/07/04 06:09:37 is Exp $);
+__RCSID($NetBSD: fetch.c,v 1.199 2012/12/21 18:07:36 christos Exp $);
#endif /* not lint */
/*
@@ -64,12 +64,16 @@ __RCSID($NetBSD: fetch.c,v 1.198 2012/0
#include unistd.h
#include time.h
+#include ssl.h
#include ftp_var.h
#include version.h
typedef enum {
UNKNOWN_URL_T=-1,
HTTP_URL_T,
+#ifdef WITH_SSL
+ HTTPS_URL_T,
+#endif
FTP_URL_T,
FILE_URL_T,
CLASSIC_URL_T
@@ -100,7 +104,15 @@ static int redirect_loop;
#define FILE_URL file:// /* file URL prefix */
#define FTP_URL ftp://; /* ftp URL prefix */
#define HTTP_URL http://; /* http URL prefix */
+#ifdef WITH_SSL
+#define HTTPS_URL https://; /* https URL prefix */
+#define IS_HTTP_TYPE(urltype) \
+ (((urltype) == HTTP_URL_T) || ((urltype) == HTTPS_URL_T))
+#else
+#define IS_HTTP_TYPE(urltype) \
+ ((urltype) == HTTP_URL_T)
+#endif
/*
* Determine if token is the next word in buf (case insensitive).
@@ -346,6 +358,13 @@ parse_url(const char *url, const char *d
} else if (STRNEQUAL(url, FILE_URL)) {
url += sizeof(FILE_URL) - 1;
*utype = FILE_URL_T;
+#ifdef WITH_SSL
+ } else if (STRNEQUAL(url, HTTPS_URL)) {
+ url += sizeof(HTTPS_URL) - 1;
+ *utype = HTTPS_URL_T;
+ *portnum = HTTPS_PORT;
+ tport = httpsport;
+#endif
} else {
warnx(Invalid %s `%s', desc, url);
cleanup_parse_url:
@@ -498,17 +517,21 @@ fetch_url(const char *url, const char *p
char *puser, *ppass, *useragent;
off_t hashbytes, rangestart, rangeend, entitylen;
int (*volatile closefunc)(FILE *);
- FILE *volatile fin;
+ FETCH *volatile fin;
FILE *volatile fout;
time_t mtime;
url_t urltype;
in_port_t portnum;
+#ifdef WITH_SSL
+ void *ssl;
+#endif
DPRINTF(fetch_url: `%s' proxyenv `%s'\n, url, STRorNULL(proxyenv));
oldintr = oldintp = NULL;
closefunc = NULL;
- fin = fout = NULL;
+ fin = NULL;
+ fout = NULL;
s = -1;
savefile = NULL;
auth = location = message = NULL;
@@ -531,7 +554,7 @@ fetch_url(const char *url, const char *p
rval = fetch_ftp(url);
goto cleanup_fetch_url;
}
- if (urltype != HTTP_URL_T || outfile == NULL) {
+ if (!IS_HTTP_TYPE(urltype) || outfile == NULL) {
warnx(Invalid URL (no file after host) `%s', url);
goto cleanup_fetch_url;
}
@@ -571,17 +594,17 @@ fetch_url(const char *url, const char *p
}
if (urltype == FILE_URL_T) { /* file:// URLs */
direction = copied;
- fin = fopen(decodedpath, r);
+ fin = fetch_open(decodedpath, r);
if (fin == NULL) {
warn(Can't open `%s', decodedpath);
goto cleanup_fetch_url;
}
- if (fstat(fileno(fin), sb) == 0) {
+ if (fstat(fetch_fileno(fin), sb) == 0) {
mtime = sb.st_mtime;
filesize = sb.st_size;
}
if (restart_point) {
- if (lseek(fileno(fin), restart_point, SEEK_SET) 0) {
+ if (lseek(fetch_fileno(fin), restart_point, SEEK_SET) 0) {
warn(Can't seek to restart `%s',
decodedpath);
goto cleanup_fetch_url;
@@ -594,12 +617,15 @@ fetch_url(const char *url, const char *p
(LLT)restart_point);
CVS commit: src/rescue
Module Name:src Committed By: christos Date: Fri Dec 21 18:09:39 UTC 2012 Modified Files: src/rescue: list.crypto Log Message: PR/47276: ftp has ssl support now. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/rescue/list.crypto Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/rescue/list.crypto diff -u src/rescue/list.crypto:1.8 src/rescue/list.crypto:1.9 --- src/rescue/list.crypto:1.8 Mon Jul 20 15:59:22 2009 +++ src/rescue/list.crypto Fri Dec 21 13:09:39 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list.crypto,v 1.8 2009/07/20 19:59:22 christos Exp $ +# $NetBSD: list.crypto,v 1.9 2012/12/21 18:09:39 christos Exp $ PROG cgdconfig @@ -7,4 +7,4 @@ PROG ssh slogin SPECIAL scp srcdir crypto/external/bsd/openssh/bin/scp SPECIAL ssh srcdir crypto/external/bsd/openssh/bin/ssh -LIBS -lssh -lcrypto +LIBS -lssh -lssl -lcrypto
CVS commit: src/distrib/amd64/cdroms
Module Name:src
Committed By: christos
Date: Fri Dec 21 18:11:11 UTC 2012
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
Log Message:
PR/47276: ftp has https support now
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/amd64/cdroms/Makefile.cdrom
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.7 src/distrib/amd64/cdroms/Makefile.cdrom:1.8
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.7 Sun Jun 3 19:19:09 2012
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Dec 21 13:11:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.7 2012/06/03 23:19:09 joerg Exp $
+# $NetBSD: Makefile.cdrom,v 1.8 2012/12/21 18:11:10 christos Exp $
.include bsd.own.mk
@@ -47,6 +47,10 @@ CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
+.if (${MKCRYPTO} != no)
+CDRUNTIME+= ./usr/lib/libcrypto.so*
+CDRUNTIME+= ./usr/lib/libssl.so*
+.endif
CDRUNTIME+= ./usr/libexec/ld.elf_so
CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
CVS commit: src/distrib/i386/cdroms
Module Name:src
Committed By: christos
Date: Fri Dec 21 18:13:22 UTC 2012
Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
Log Message:
PR/47276: ftp has https support now
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/i386/cdroms/Makefile.cdrom
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.27 src/distrib/i386/cdroms/Makefile.cdrom:1.28
--- src/distrib/i386/cdroms/Makefile.cdrom:1.27 Sun Jun 3 19:19:09 2012
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Dec 21 13:13:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.27 2012/06/03 23:19:09 joerg Exp $
+# $NetBSD: Makefile.cdrom,v 1.28 2012/12/21 18:13:22 christos Exp $
.include bsd.own.mk
@@ -47,6 +47,10 @@ CDRUNTIME+= ./usr/lib/liblzma.so*
CDRUNTIME+= ./usr/lib/libterminfo.so*
CDRUNTIME+= ./usr/lib/libutil.so*
CDRUNTIME+= ./usr/lib/libz.so*
+.if (${MKCRYPTO} != no)
+CDRUNTIME+= ./usr/lib/libcrypto.so*
+CDRUNTIME+= ./usr/lib/libssl.so*
+.endif
CDRUNTIME+= ./usr/libexec/ld.elf_so
CDRUNTIME+= ./usr/libexec/getty
CDRUNTIME+= ./usr/mdec
CVS commit: src/external/public-domain/sqlite/dist
Module Name:src Committed By: njoly Date: Fri Dec 21 19:26:40 UTC 2012 Modified Files: src/external/public-domain/sqlite/dist: sqlite3.1 Log Message: Fix unknown Fi macro. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/sqlite/dist/sqlite3.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/dist/sqlite3.1 diff -u src/external/public-domain/sqlite/dist/sqlite3.1:1.4 src/external/public-domain/sqlite/dist/sqlite3.1:1.5 --- src/external/public-domain/sqlite/dist/sqlite3.1:1.4 Mon Dec 17 16:26:38 2012 +++ src/external/public-domain/sqlite/dist/sqlite3.1 Fri Dec 21 19:26:39 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: sqlite3.1,v 1.4 2012/12/17 16:26:38 christos Exp $ +.\ $NetBSD: sqlite3.1,v 1.5 2012/12/21 19:26:39 njoly Exp $ .Dd December 16, 2012 .Dt SQLITE3 1 .Os @@ -168,7 +168,7 @@ continue prompt =... .Ed .It If the file -.Fi ~/.sqliterc +.Pa ~/.sqliterc exists, it is processed first. can be found in the user's home directory, it is read and processed.
CVS commit: src/sys/kern
Module Name:src
Committed By: njoly
Date: Fri Dec 21 19:39:48 UTC 2012
Modified Files:
src/sys/kern: kern_resource.c
Log Message:
One semi-column is enough.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/kern/kern_resource.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/kern/kern_resource.c
diff -u src/sys/kern/kern_resource.c:1.170 src/sys/kern/kern_resource.c:1.171
--- src/sys/kern/kern_resource.c:1.170 Sat Nov 3 23:22:22 2012
+++ src/sys/kern/kern_resource.c Fri Dec 21 19:39:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_resource.c,v 1.170 2012/11/03 23:22:22 njoly Exp $ */
+/* $NetBSD: kern_resource.c,v 1.171 2012/12/21 19:39:48 njoly Exp $ */
/*-
* Copyright (c) 1982, 1986, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_resource.c,v 1.170 2012/11/03 23:22:22 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_resource.c,v 1.171 2012/12/21 19:39:48 njoly Exp $);
#include sys/param.h
#include sys/systm.h
@@ -171,7 +171,7 @@ sys_getpriority(struct lwp *l, const str
mutex_enter(proc_lock);
switch (SCARG(uap, which)) {
case PRIO_PROCESS:
- p = who ? proc_find(who) : curp;;
+ p = who ? proc_find(who) : curp;
if (p != NULL)
low = p-p_nice;
break;
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: jakllsch
Date: Sat Dec 22 03:56:58 UTC 2012
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
Add support for SDHCI 3.0 bus clock generation, which unlike 1.0 and 2.0
has support for non-power-of-two divisors from 1 to 1023. Additionally
restore finding the correct power-of-two divisor for standard-compliant
pre-3.0 SDHCI parts. Also, calculate minimum divided clock for the
clkmsk-quirk parts correctly.
XXX Will future standard-compliant SDHCI versions have a SDHCI 3.0
backwards-compatible clock generator, or just SDHCI 1.0/2.0?
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.37 src/sys/dev/sdmmc/sdhc.c:1.38
--- src/sys/dev/sdmmc/sdhc.c:1.37 Thu Dec 20 22:56:38 2012
+++ src/sys/dev/sdmmc/sdhc.c Sat Dec 22 03:56:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.37 2012/12/20 22:56:38 jakllsch Exp $ */
+/* $NetBSD: sdhc.c,v 1.38 2012/12/22 03:56:58 jakllsch Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.37 2012/12/20 22:56:38 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.38 2012/12/22 03:56:58 jakllsch Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -398,12 +398,18 @@ sdhc_host_found(struct sdhc_softc *sc, b
saa.saa_sct = sdhc_functions;
saa.saa_sch = hp;
saa.saa_dmat = hp-dmat;
- saa.saa_clkmin = hp-clkbase / 256;
saa.saa_clkmax = hp-clkbase;
if (ISSET(sc-sc_flags, SDHC_FLAG_HAVE_CGM))
- saa.saa_clkmin /= 2046;
+ saa.saa_clkmin = hp-clkbase / 256 / 2046;
else if (ISSET(sc-sc_flags, SDHC_FLAG_HAVE_DVS))
- saa.saa_clkmin /= 16;
+ saa.saa_clkmin = hp-clkbase / 256 / 16;
+ else if (hp-sc-sc_clkmsk != 0)
+ saa.saa_clkmin = hp-clkbase / (hp-sc-sc_clkmsk
+ (ffs(hp-sc-sc_clkmsk) - 1));
+ else if (hp-specver == SDHC_SPEC_VERS_300)
+ saa.saa_clkmin = hp-clkbase / 0x3ff;
+ else
+ saa.saa_clkmin = hp-clkbase / 256;
saa.saa_caps = SMC_CAPS_4BIT_MODE|SMC_CAPS_AUTO_STOP;
if (ISSET(sc-sc_flags, SDHC_FLAG_8BIT_MODE))
saa.saa_caps |= SMC_CAPS_8BIT_MODE;
@@ -795,14 +801,36 @@ sdhc_clock_divisor(struct sdhc_host *hp,
}
/* No divisor found. */
return false;
- } else {
- if (hp-sc-sc_clkmsk != 0)
- *divp = (hp-clkbase / freq)
- (ffs(hp-sc-sc_clkmsk) - 1);
- else
- *divp = (hp-clkbase / freq) SDHC_SDCLK_DIV_SHIFT;
+ }
+ if (hp-sc-sc_clkmsk != 0) {
+ div = howmany(hp-clkbase, freq);
+ if (div (hp-sc-sc_clkmsk (ffs(hp-sc-sc_clkmsk) - 1)))
+ return false;
+ *divp = div (ffs(hp-sc-sc_clkmsk) - 1);
+ //freq = hp-clkbase / div;
return true;
}
+ if (hp-specver == SDHC_SPEC_VERS_300) {
+ div = howmany(hp-clkbase, freq);
+ if (div 0x3ff)
+ return false;
+ *divp = (((div 8) SDHC_SDCLK_XDIV_MASK)
+ SDHC_SDCLK_XDIV_SHIFT) |
+ (((div 0) SDHC_SDCLK_DIV_MASK)
+ SDHC_SDCLK_DIV_SHIFT);
+ //freq = hp-clkbase / div;
+ return true;
+ } else {
+ for (div = 1; div = 256; div *= 2) {
+ if ((hp-clkbase / div) = freq) {
+*divp = (div / 2) SDHC_SDCLK_DIV_SHIFT;
+//freq = hp-clkbase / div;
+return true;
+ }
+ }
+ /* No divisor found. */
+ return false;
+ }
/* No divisor found. */
return false;
}
