diff options
| author | joerg <joerg@pkgsrc.org> | 2010-09-15 13:18:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-09-15 13:18:01 +0000 |
| commit | a3bfac8e81f0ea1edeff82c98c3b89af07d568e7 (patch) | |
| tree | ce56352e854093f56ede7d135114699a9079bbd3 /pkgtools | |
| parent | fbff94d74569efc05c23d9020d3c6e496045fa69 (diff) | |
| download | pkgsrc-a3bfac8e81f0ea1edeff82c98c3b89af07d568e7.tar.gz | |
pkg_install-20100915: Allow https URLs. From mbalmer.
Reset maintainership.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/file.c | 13 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index db82561f809..b845c1d5fa6 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.179 2010/04/20 00:39:12 joerg Exp $ +# $NetBSD: Makefile,v 1.180 2010/09/15 13:18:01 joerg Exp $ # Notes to package maintainers: # @@ -11,7 +11,7 @@ CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty -OWNER= joerg@NetBSD.org +MAINTAINER= pksgrc-users@NetBSD.org HOMEPAGE= http://www.pkgsrc.org/ COMMENT= Package management and administration tools for pkgsrc LICENSE= modified-bsd diff --git a/pkgtools/pkg_install/files/lib/file.c b/pkgtools/pkg_install/files/lib/file.c index 09979182a3d..82d5f235108 100644 --- a/pkgtools/pkg_install/files/lib/file.c +++ b/pkgtools/pkg_install/files/lib/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.29 2009/09/11 18:00:13 joerg Exp $ */ +/* $NetBSD: file.c,v 1.30 2010/09/15 13:18:02 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -13,7 +13,7 @@ #if HAVE_SYS_QUEUE_H #include <sys/queue.h> #endif -__RCSID("$NetBSD: file.c,v 1.29 2009/09/11 18:00:13 joerg Exp $"); +__RCSID("$NetBSD: file.c,v 1.30 2010/09/15 13:18:02 joerg Exp $"); /* * FreeBSD install - a package for the installation and maintainance @@ -181,9 +181,12 @@ typedef struct url_t { /* A table of valid leading strings for URLs */ static const url_t urls[] = { - {"file://", 7}, - {"ftp://", 6}, - {"http://", 7}, +#define STR_AND_SIZE(str) { str, sizeof(str) - 1 } + STR_AND_SIZE("file://"), + STR_AND_SIZE("ftp://"), + STR_AND_SIZE("http://"), + STR_AND_SIZE("https://"), +#undef STR_AND_SIZE {NULL, 0} }; diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index 5e10b28843c..b2d49567627 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.157 2010/09/14 22:26:19 gdt Exp $ */ +/* $NetBSD: version.h,v 1.158 2010/09/15 13:18:02 joerg Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -27,6 +27,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION 20100914 +#define PKGTOOLS_VERSION 20100915 #endif /* _INST_LIB_VERSION_H_ */ |