summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-02-02 10:19:41 +0000
committerwiz <wiz@pkgsrc.org>2014-02-02 10:19:41 +0000
commitd875d1223ac870a66e5f6b9b27945d5f719f430b (patch)
tree353974a8c9f418166aeb57b2330b86ddaedab8b8 /pkgtools
parent13edc8f4e345e9af15583b32cff28664b3c05d5e (diff)
downloadpkgsrc-d875d1223ac870a66e5f6b9b27945d5f719f430b.tar.gz
https support.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_notify/Makefile6
-rwxr-xr-xpkgtools/pkg_notify/files/pkg_notify10
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile
index 055612dd328..98e9264f204 100644
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2013/05/31 12:41:46 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/02/02 10:19:41 wiz Exp $
-DISTNAME= pkg_notify-0.4.3
-PKGREVISION= 2
+DISTNAME= pkg_notify-0.4.4
CATEGORIES= pkgtools
MASTER_SITES= # none
DISTFILES= # none
diff --git a/pkgtools/pkg_notify/files/pkg_notify b/pkgtools/pkg_notify/files/pkg_notify
index 6eaede1dca3..0cede3d2596 100755
--- a/pkgtools/pkg_notify/files/pkg_notify
+++ b/pkgtools/pkg_notify/files/pkg_notify
@@ -16,7 +16,7 @@
#
# $ pkg_notify category/package
#
-# $Id: pkg_notify,v 1.1 2009/02/18 21:23:21 imil Exp $
+# $Id: pkg_notify,v 1.2 2014/02/02 10:19:41 wiz Exp $
use Net::FTP;
use LWP::UserAgent;
@@ -470,16 +470,16 @@ sub sort_master_sites {
if ($m_list =~ /$SF_NET/) {
# we only want ftp sites from SF
- $m_list =~ s/http:\/\/[^\t\ \n]+//g;
+ $m_list =~ s/https?:\/\/[^\t\ \n]+//g;
$m_list =~ s/[\t\ \r\n]+//g;
}
# graphics/libggi packages-like fix (ftp://blahhttp://bleh): missing space
# this is because of previous SF's char stripping
- $m_list =~ s/([^\ ])(ftp\:|http\:)/$1\ $2/g;
+ $m_list =~ s/([^\ ])(ftp\:|http\:|https\:)/$1\ $2/g;
foreach (@master_sort_list) {
- if ($m_list =~ /(.*)(http|ftp)(\:\/\/[^\t\ ]*$_[^\t\ ]*)(.*)/) {
+ if ($m_list =~ /(.*)(http|https|ftp)(\:\/\/[^\t\ ]*$_[^\t\ ]*)(.*)/) {
push @s_list, $2.$3;
$m_list = $1 . $4;
}
@@ -653,7 +653,7 @@ foreach (@packages) {
}
# http master site
- } elsif ($master_site =~ /^http\:\/\//) {
+ } elsif ($master_site =~ /^https?\:\/\//) {
http_ls($master_site, $distname);
} else {
print "unsupported MASTER_SITES protocol";