X-Git-Url: http://cgit.sxemacs.org/?p=sxemacs;a=blobdiff_plain;f=lisp%2Fpackage-get.el;fp=lisp%2Fpackage-get.el;h=f680618ab3b1121856a53b1e464538108c5dc4c2;hp=f12d309408644a0f3c934ff044c03313490052f1;hb=5627b0461b0094ad971c957ca843ffe00cec09df;hpb=fc54742579c47d36b0f0358b65737dd72be5c934 diff --git a/lisp/package-get.el b/lisp/package-get.el index f12d309..f680618 100644 --- a/lisp/package-get.el +++ b/lisp/package-get.el @@ -214,6 +214,7 @@ as a local directory." ("US (Main XEmacs Site)" "ftp.xemacs.org" "pub/xemacs/packages" "ftp") ;; In alphabetical order of Country, our mirrors... + ;; Timing out ("Belgium (be.xemacs.org)" "ftp.be.xemacs.org" "xemacs/packages" "ftp") ("Canada (ca.xemacs.org)" @@ -222,24 +223,32 @@ as a local directory." "ftp.dk.xemacs.org" "xemacs/packages" "ftp") ("France (fr.xemacs.org)" "ftp.fr.xemacs.org" "pub/xemacs/packages" "ftp") + ;; Temporary errors? ("France (mirror.cict.fr)" "mirror.cict.fr" "xemacs/packages" "ftp") ("France (pasteur.fr)" "ftp.pasteur.fr" "pub/computing/xemacs/packages" "ftp") + ;; Very outdated, experimental not updated since 2013 ("Germany (de.xemacs.org)" "ftp.de.xemacs.org" "pub/ftp.xemacs.org/tux/xemacs/packages" "ftp") + ;; Timing out ("Greece (gr.xemacs.org)" "ftp.gr.xemacs.org" "mirrors/XEmacs/ftp/packages" "ftp") ("Ireland (heanet.ie)" "ftp.heanet.ie" "mirrors/ftp.xemacs.org/packages" "ftp") + ;; Timing out ("Italy (it.xemacs.org)" "ftp.it.xemacs.org" "unix/packages/XEMACS/packages" "ftp") + ;; Timing out ("Japan (dti.ad.jp)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/packages" "ftp") ("Norway (no.xemacs.org)" "ftp.no.xemacs.org" "pub/xemacs/packages" "ftp") ("Portugal (pt.xemacs.org)" "ftp.pt.xemacs.org" "pub/MIRRORS/ftp.xemacs.org/packages" "ftp") + ;; Timing out + ("Russia (ru.xemacs.org)" + "ftp.ru.xemacs.org" "pub/emacs/xemacs/packages" "ftp") ("Saudi Arabia (sa.xemacs.org)" "ftp.sa.xemacs.org" "pub/xemacs.org/packages" "ftp") ("Sweden (se.xemacs.org)" @@ -267,50 +276,6 @@ package download sites." host-name directory url-scheme)) :group 'package-get) -;;; Dead Sites (normal release) - ; Unknown host - ;("Argentina (xmundo.net)" "xemacs.xmundo.net" "pub/mirrors/xemacs/packages") - ; No longer carries XEmacs releases or packages - ;("Australia (aarnet.edu.au)" "mirror.aarnet.edu.au" "pub/xemacs/packages") - ; Unknown host - ;("Australia (au.xemacs.org)" "ftp.au.xemacs.org" "pub/xemacs/packages") - ; No longer carries XEmacs releases or packages - ;("Austria (at.xemacs.org)" "ftp.at.xemacs.org" "editors/xemacs/packages") - ; No longer carries XEmacs releases or packages - ;("Brazil (br.xemacs.org)" "ftp.br.xemacs.org" "pub/xemacs/packages") - ; Connection problems, can't list in either passive or not - ;("Canada (nrc.ca)" "ftp.nrc.ca" "pub/packages/editors/xemacs/packages") - ;; no anonymous ftp available, uncomment when updating website - ;; with - ;; xemacs-builds/adrian/website/package-get-2-download-sites.el -; ("Chile (cl.xemacs.org)" "ftp.cl.xemacs.org" "packages") - ; Unknown host - ;("China (ftp.cn.xemacs.org)" "ftp.cn.xemacs.org" "pub/xemacs/packages") - ; XEmacs directory exists, but is empty - ;("Czech Republic (cz.xemacs.org)" "ftp.cz.xemacs.org" "MIRRORS/ftp.xemacs.org/pub/xemacs/packages") - ; Exists, but is 3 years out of date - ;("Finland (fi.xemacs.org)" "ftp.fi.xemacs.org" "pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/packages") - ; Site exists, but has no content - ;("Hong Kong (hk.xemacs.org)" "ftp.hk.xemacs.org" "pub/xemacsftp/packages") - ; Can't connect, times out. - ;("Ireland (ie.xemacs.org)" "ftp.ie.xemacs.org" "mirrors/ftp.xemacs.org/pub/xemacs/packages") -; ("Japan (jaist.ac.jp)" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") - ; Unknown host - ;("Japan (jp.xemacs.org)" "ftp.jp.xemacs.org" "pub/text/xemacs/packages") -; ("Japan (nucba.ac.jp)" "mirror.nucba.ac.jp" "mirror/xemacs/packages") - ; Can't connect, times out. - ;("Korea (kr.xemacs.org)" "ftp.kr.xemacs.org" "pub/tools/emacs/xemacs/packages") - ; No anonymous ftp available - ;("Netherlands (nl.xemacs.org)" "ftp.nl.xemacs.org" "pub/xemacs/ftp/packages") - ;; no anonymous ftp available, uncomment when updating website - ;; with - ;; xemacs-builds/adrian/website/package-get-2-download-sites.el -; ("Netherlands (xemacsftp.digimirror.nl)" "xemacsftp.digimirror.nl" "packages") - ; Times out - ;("Russia (ru.xemacs.org)" "ftp.ru.xemacs.org" "pub/emacs/xemacs/packages") - ; Unknown host - ;("US (us.xemacs.org)" "ftp.us.xemacs.org" "pub/mirrors/xemacs/packages") - ;;;###autoload (defcustom package-get-pre-release-download-sites `(,@(when package-get-have-curl @@ -319,6 +284,7 @@ package download sites." ("US Pre-Releases (Main XEmacs Site)" "ftp.xemacs.org" "pub/xemacs/beta/experimental/packages" "ftp") ;; In alphabetical order of Country, our mirrors... + ;; Timing out ("Belgium Pre-Releases (be.xemacs.org)" "ftp.be.xemacs.org" "xemacs/beta/experimental/packages" "ftp") ("Canada Pre-Releases (ca.xemacs.org)" "ftp.ca.xemacs.org" @@ -333,16 +299,20 @@ package download sites." "xemacs/beta/experimental/packages" "ftp") ("France Pre-Releases (pasteur.fr)" "ftp.pasteur.fr" "pub/computing/xemacs/beta/experimental/packages" "ftp") + ;; Very outdated, experimental not updated since 2013 ("Germany Pre-Releases (de.xemacs.org)" "ftp.de.xemacs.org" "pub/ftp.xemacs.org/tux/xemacs/beta/experimental/packages" "ftp") + ;; Timing out ("Greece Pre-Releases (gr.xemacs.org)" "ftp.gr.xemacs.org" "mirrors/XEmacs/ftp/beta/experimental/packages" "ftp") ("Ireland Pre-Releases (heanet.ie)" "ftp.heanet.ie" "mirrors/ftp.xemacs.org/beta/experimental/packages" "ftp") + ;; Timing out ("Italy Pre-Releases (it.xemacs.org)" "ftp.it.xemacs.org" "unix/packages/XEMACS/beta/experimental/packages" "ftp") ; Was out of date as at 2013-04-12. Hopefully not a sign they are ; no longer updating. + ;; Timing out ("Japan Pre-Releases (dti.ad.jp)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/beta/experimental/packages" "ftp") ("Norway Pre-Releases (no.xemacs.org)" "ftp.no.xemacs.org" @@ -376,69 +346,6 @@ package download sites." host-name directory url-scheme)) :group 'package-get) -;;; Dead sites (pre-release) - ; Unknown host - ;("Argentina Pre-Releases (xmundo.net)" "xemacs.xmundo.net" - ; "pub/mirrors/xemacs/beta/experimental/packages") - ; No longer carries XEmacs releases or packages - ;("Australia Pre-Releases (aarnet.edu.au)" "mirror.aarnet.edu.au" - ; "pub/xemacs/beta/experimental/packages") - ; Unknown host - ;("Australia Pre-Releases (au.xemacs.org)" "ftp.au.xemacs.org" - ; "pub/xemacs/beta/experimental/packages") - ; No longer carries XEmacs releases or packages - ;("Austria Pre-Releases (at.xemacs.org)" "ftp.at.xemacs.org" - ; "editors/xemacs/beta/experimental/packages") - ; No longer carries XEmacs releases or packages - ;("Brazil Pre-Releases (br.xemacs.org)" "ftp.br.xemacs.org" - ; "pub/xemacs/xemacs-21.5/experimental/packages") - ; Connection problems, can't list in either passive or not - ;("Canada Pre-Releases (nrc.ca)" "ftp.nrc.ca" - ; "pub/packages/editors/xemacs/beta/experimental/packages") - ;; no anonymous ftp available, uncomment when updating website - ;; with - ;; xemacs-builds/adrian/website/package-get-2-download-sites.el -; ("Chile Pre-Releases (cl.xemacs.org)" "ftp.cl.xemacs.org" -; "beta/experimental/packages") - ; Unknown host - ;("China Pre-Releases (ftp.cn.xemacs.org)" "ftp.cn.xemacs.org" - ; "pub/xemacs/beta/experimental/packages") - ; XEmacs directory exists, but is empty - ;("Czech Republic Pre-Releases (cz.xemacs.org)" "ftp.cz.xemacs.org" - ; "MIRRORS/ftp.xemacs.org/pub/xemacs/xemacs-21.5/experimental/packages") - ; Exists, but is 3 years out of date - ;("Finland Pre-Releases (fi.xemacs.org)" "ftp.fi.xemacs.org" - ; "pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/beta/experimental/packages") - ; Site exists, but has no content - ;("Hong Kong Pre-Releases (hk.xemacs.org)" "ftp.hk.xemacs.org" - ; "pub/xemacsftp/beta/experimental/packages") - ; Can't connect, times out. - ;("Ireland Pre-Releases (ie.xemacs.org)" "ftp.ie.xemacs.org" - ; "mirrors/ftp.xemacs.org/pub/xemacs/beta/experimental/packages") -; ("Japan Pre-Releases (jaist.ac.jp)" "ftp.jaist.ac.jp" -; "pub/GNU/xemacs/beta/experimental/packages") - ; Unknown host - ;("Japan Pre-Releases (jp.xemacs.org)" "ftp.jp.xemacs.org" - ; "pub/text/xemacs/beta/experimental/packages") - ; Can't connect, times out. - ;("Korea Pre-Releases (kr.xemacs.org)" "ftp.kr.xemacs.org" - ; "pub/tools/emacs/xemacs/beta/experimental/packages") - ; No anonymous ftp available - ;("Netherlands Pre-Releases (nl.xemacs.org)" "ftp.nl.xemacs.org" - ; "pub/xemacs/ftp/beta/experimental/packages") - ;; no anonymous ftp available, uncomment when updating website - ;; with - ;; xemacs-builds/adrian/website/package-get-2-download-sites.el -; ("Netherlands Pre-Releases (xemacsftp.digimirror.nl)" "xemacsftp.digimirror.nl" -; "beta/experimental/packages") - ; Times out - ;("Russia Pre-Releases (ru.xemacs.org)" "ftp.ru.xemacs.org" - ; "pub/emacs/xemacs/beta/experimental/packages") - ; Unknown host - ;("US Pre-Releases (us.xemacs.org)" "ftp.us.xemacs.org" - ; "pub/mirrors/xemacs/beta/experimental/packages") - - ;;;###autoload (defcustom package-get-site-release-download-sites nil "*List of remote sites available for downloading \"Site Release\" packages. @@ -1340,109 +1247,6 @@ lead to Emacs accessing remote sites." (intern (substring (symbol-name pkg) 0 (match-beginning 0)))) t))) -;; This is obsolete now that #'package-get can use #'curl:download -;;(defun pui-bootstrap () -;; "Bootstrap the SXEmacs Package Tools. - -;;The Package Tools, under normal circumstances, cannot work until a -;;couple of packages are pre-installed by hand. This function eliminates -;;the need to do that. It uses FFI and libcurl to download and install -;;the lastest package index file, the EFS and xemacs-base packages. - -;;Obviously you can't use this if you didn't enable FFI support in your -;;SXEmacs or if you don't have libffi on your system. - -;;This isn't designed to replace the existing Package Tools so after -;;you have run `pui-bootstrap' once you should then use the normal PUI -;;tools, `pui-list-packages' etc." -;; (interactive) -;; ;; A little sanity checking never hurt anybody -;; (when (featurep '(and efs-autoloads xemacs-base-autoloads)) -;; (error 'invalid-operation "PUI doesn't need bootstrapping")) -;; (when (and (fboundp 'ffi-defun) -;; (not (featurep '(and ffi ffi-curl)))) -;; (require 'ffi-curl)) -;; (unless (featurep 'ffi) -;; (error 'unimplemented "FFI")) -;; ;; One last check... has `package-get-remote' been set? -;; (if (not (cdr package-get-remote)) -;; (when (y-or-n-p "You haven't set a download site, do you need help ") -;; (declare-fboundp (Info-goto-node "(sxemacs)Bootstrapping PUI"))) -;; ;; We should be good to go -;; (let* ((site (car package-get-remote)) -;; (dir (cadr package-get-remote)) -;; (scheme (third package-get-remote)) -;; (url (concat scheme "://" site "/" dir "/")) -;; (dldir (temp-directory)) -;; (index (expand-file-name package-get-base-filename -;; package-get-package-index-file-location)) -;; xemacs-base-pkg -;; efs-pkg -;; ;status) -;; ) -;; ;; Grab the index -;; (message "Retrieving index, please be patient") -;; (declare-fboundp (curl:download (concat url package-get-base-filename) index)) -;; (message "Retrieving index, done!") -;; ;; Update the db -;; (set-buffer (find-file-noselect index)) -;; (package-get-update-base-from-buffer) -;; (kill-buffer (current-buffer)) -;; ;; Get xemacs-base, EFS -;; (setq xemacs-base-pkg (package-get-info 'xemacs-base 'filename)) -;; (setq efs-pkg (package-get-info 'efs 'filename)) -;; (message "Retrieving %s, please be patient" xemacs-base-pkg) -;; (declare-fboundp (curl:download (concat url xemacs-base-pkg) -;; (expand-file-name xemacs-base-pkg dldir))) -;; (message "Retrieving %s, please be patient" efs-pkg) -;; (declare-fboundp (curl:download (concat url efs-pkg) -;; (expand-file-name efs-pkg dldir))) -;; (message "Download complete.") -;; ;; Install xemacs-base -;; (if (equal (package-get-info 'xemacs-base 'md5sum) -;; (with-temp-buffer -;; (insert-file-contents-literally -;; (expand-file-name xemacs-base-pkg dldir)) -;; (md5 (current-buffer)))) -;; (progn -;; (package-admin-add-binary-package -;; (expand-file-name xemacs-base-pkg dldir) -;; (package-admin-get-install-dir 'xemacs-base)) -;; (push (file-name-as-directory -;; (expand-file-name "lisp/xemacs-base" -;; (package-admin-get-install-dir 'xemacs-base))) -;; load-path) -;; (load-file (expand-file-name "lisp/xemacs-base/_pkg.el" -;; (package-admin-get-install-dir 'xemacs-base))) -;; (load-file (expand-file-name "lisp/xemacs-base/auto-autoloads.el" -;; (package-admin-get-install-dir 'xemacs-base))) -;; (message "xemacs-base package installed")) -;; (delete-file (expand-file-name xemacs-base-pkg dldir)) -;; (error "MD5 mismatch, %s deleted" (expand-file-name xemacs-base-pkg dldir))) -;; ;; Install EFS -;; (if (equal (package-get-info 'efs 'md5sum) -;; (with-temp-buffer -;; (insert-file-contents-literally -;; (expand-file-name efs-pkg dldir)) -;; (md5 (current-buffer)))) -;; (progn -;; (package-admin-add-binary-package -;; (expand-file-name efs-pkg dldir) -;; (package-admin-get-install-dir 'efs)) -;; (push (file-name-as-directory -;; (expand-file-name "lisp/efs" -;; (package-admin-get-install-dir 'efs))) -;; load-path) -;; (load-file (expand-file-name "lisp/efs/_pkg.el" -;; (package-admin-get-install-dir 'efs))) -;; (load-file (expand-file-name "lisp/efs/auto-autoloads.el" -;; (package-admin-get-install-dir 'efs))) -;; (message "efs package installed")) -;; (delete-file (expand-file-name efs-pkg dldir)) -;; (error "MD5 mismatch, %s deleted" (expand-file-name efs-pkg dldir))) -;; (when (y-or-n-p "Install more packages? ") -;; (declare-fboundp (pui-list-packages)))))) - (provide 'package-get) ;; On-load forms