diff options
| -rw-r--r-- | Makefile.PL | 2 | ||||
| -rw-r--r-- | pod/8/urpmi.addmedia.pod | 8 | ||||
| -rw-r--r-- | pod/8/urpmi.pod | 2 | ||||
| -rw-r--r-- | pod/8/urpmihowto.pod | 4 | ||||
| -rwxr-xr-x | urpmi.addmedia | 3 | ||||
| -rw-r--r-- | urpmi.bash-completion | 2 | ||||
| -rw-r--r-- | urpmi.schema | 2 |
7 files changed, 14 insertions, 9 deletions
diff --git a/Makefile.PL b/Makefile.PL index ded2fb64..b6ef2165 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -200,7 +200,7 @@ WriteMakefile( repository => { type => 'git', url => 'git://git.mageia.org/software/rpm/urpmi/', - web => 'http://gitweb.mageia.org/software/rpm/urpmi/', + web => 'https://gitweb.mageia.org/software/rpm/urpmi/', }, }, release_status => 'stable', diff --git a/pod/8/urpmi.addmedia.pod b/pod/8/urpmi.addmedia.pod index 5de3b2ad..ec51670e 100644 --- a/pod/8/urpmi.addmedia.pod +++ b/pod/8/urpmi.addmedia.pod @@ -11,8 +11,8 @@ urpmi.addmedia - adds a new rpm media to be used by urpmi urpmi.addmedia is used to add a new media to be used by urpmi, so it can find new rpms at the specified location. Currently supported media types are: local drives, removable drives (such as CDs), and networked media via -different protocols (http, ftp, ssh and rsync). One of the following modes -must be chosen: +different protocols (http, https, ftp, ssh and rsync). One of the following +modes must be chosen: =over @@ -41,6 +41,10 @@ I<options>. Example: urpmi.addmedia http http://jpackage.sf.net/rpm/free +=item B<urpmi.addmedia> [I<options>] <I<name>> https://<I<login>>:<I<pass>>@<I<host>>/<I<path>> + +The same as for http but using the encrypted https protocol. + =item B<urpmi.addmedia> [I<options>] <I<name>> ftp://<I<login>>:<I<pass>>@<I<host>>/<I<path>> The same as for http. Add your login and password if required (note that diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod index 0f7e58fe..1ebef239 100644 --- a/pod/8/urpmi.pod +++ b/pod/8/urpmi.pod @@ -587,7 +587,7 @@ think is wrong. One can find the git repository / version-control repository (VCS) here: -L<http://gitweb.mageia.org/software/rpm/urpmi/> . +L<https://gitweb.mageia.org/software/rpm/urpmi/> . =head1 AUTHOR diff --git a/pod/8/urpmihowto.pod b/pod/8/urpmihowto.pod index 22f2f3e2..d66bd39e 100644 --- a/pod/8/urpmihowto.pod +++ b/pod/8/urpmihowto.pod @@ -17,7 +17,7 @@ urpmi gets the list of available RPMs, and the RPMs themselves, from a B<media>. Roughly speaking, a media is described by a name and by a location, specified by an URL. Currently supported media types are: local drives, removable drives (such as CDs), ISO images, and networked media -via different protocols (http, ftp, ssh and rsync). NFS mounted +via different protocols (http, https, ftp, ssh and rsync). NFS mounted directories are treated like local drives. =head2 Installing and updating RPMs @@ -105,7 +105,7 @@ follows: In this synopsis, C<< <name> >> is the name of the new media, C<< <url> >> the URL where the RPMs are to be found. -Supported URLs can be C<http://>, C<ftp://>, C<rsync://>, C<ssh://> (this +Supported URLs can be C<http://>, C<https://>, C<ftp://>, C<rsync://>, C<ssh://> (this will use rsync over ssh), C<file://>, and C<cdrom://>. If the media requires authentication, you can use the usual URL syntax: diff --git a/urpmi.addmedia b/urpmi.addmedia index 19d23b02..566ca9ec 100755 --- a/urpmi.addmedia +++ b/urpmi.addmedia @@ -31,7 +31,7 @@ use urpm::util 'member'; sub usage { my $m = shift; my $usage = - #-PO: The URI types strings 'file:', 'ftp:', 'http:', and 'cdrom:' must not be translated! + #-PO: The URI types strings 'file:', 'ftp:', 'http:', 'https:', and 'cdrom:' must not be translated! #-PO: neither the ``with''. Only what is between <brackets> can be translated. N("usage: urpmi.addmedia [options] <name> <url> where <url> is one of @@ -39,6 +39,7 @@ where <url> is one of ftp://<login>:<password>\@<host>/<path> ftp://<host>/<path> http://<host>/<path> + https://<host>/<path> cdrom://<path> usage: urpmi.addmedia [options] --distrib --mirrorlist <url> diff --git a/urpmi.bash-completion b/urpmi.bash-completion index 48d381fb..9d48c679 100644 --- a/urpmi.bash-completion +++ b/urpmi.bash-completion @@ -292,7 +292,7 @@ _urpmi_addmedia() 2) # return list of available protocols COMPREPLY=( $( compgen -W 'file:// http:// \ - ftp:// removable:// ssh:// \ + https:// ftp:// removable:// ssh:// \ rsync://' -- $cur ) ) ;; 3) diff --git a/urpmi.schema b/urpmi.schema index 80a92893..0aa252c1 100644 --- a/urpmi.schema +++ b/urpmi.schema @@ -1,6 +1,6 @@ # TODO sOmeone need to change this with Mandrakesoft OID. -# http://www.iana.org/assignments/enterprise-numbers +# https://www.iana.org/assignments/enterprise-numbers # 21103 # Mandrakesoft # Frederic Lepied |