diff --git a/jobo-mirror/.gitignore b/jobo-mirror/.gitignore index 9aff03a..81f1c8e 100644 --- a/jobo-mirror/.gitignore +++ b/jobo-mirror/.gitignore @@ -1 +1,2 @@ /jobo-mirror.force.install +/README.osdn-2-sf.saga.txt diff --git a/jobo-mirror/PKGBUILD b/jobo-mirror/PKGBUILD index 63a672a..5f75f6d 100644 --- a/jobo-mirror/PKGBUILD +++ b/jobo-mirror/PKGBUILD @@ -7,21 +7,19 @@ pkgname=jobo-mirror pkgdesc='joborun linux mirrorlist' -pkgver=0.2 -pkgrel=03 +pkgver=0.3 +pkgrel=01 groups=(base jobbot) source=('README.txt' - 'mirrorlist-jobo' - 'non-sf.sh') + 'mirrorlist-jobo') backup=(etc/pacman.d/mirrorlist-jobo) -depends=('sh' 'wget') -install=$pkgname.install +depends=('sh') +# install=$pkgname.install package() { cd "$pkgdir" install -Dm644 $srcdir/README.txt "$pkgdir/etc/pacman.d/README.txt" install -Dm644 $srcdir/mirrorlist-jobo "$pkgdir/etc/pacman.d/mirrorlist-jobo" - install -Dm755 $srcdir/non-sf.sh "$pkgdir/tmp/sf01/non-sf.sh" } #---- arch license gpg-key & sha256sums ---- @@ -30,12 +28,8 @@ arch=(x86_64) license=(ISC) -sha256sums=(507f355b9881c44f0f6388c8a47c24908d3adafc717e5ee447236c6162b02052 # README.txt - 9c83fe4380d71bfbe9fd7784d14b28ac0740b95a7a6eecbd236d03c6a3bb757f # mirrorlist-jobo - 53a112ac0532e88febf7cdbada0c98b36b738a552c2d495d10bc7662e127637c) # non-sf.sh +sha256sums=(a890b255a31de474552da07f7bb94089fecb2aa32f4e58656f0470b69626e13f # README.txt + 02da031772703eda2bc3a24f8aa99d0cb3def16d2f330e6e1d5e555404387038) # mirrorlist-jobo -## tarball at sourceforge -## 5d620b833b9dca4b6670723a8061cc57d14c4d3cb3760a9798a6bd691629bdb5 non-sf-pkgs.tar.xz -## this package: -## 82db9c7a5b2bd3bbc73920eef1b2fd7d046e703696c28ceca1c4c8ca22969194 jobo-mirror-0.2-03-x86_64.pkg.tar.lz +## f7e15c1e49420d763f7e31c64aa2cd0d23a9a5bb504d1292ada118515f08de73 jobo-mirror-0.3-01-x86_64.pkg.tar.lz diff --git a/jobo-mirror/README.txt b/jobo-mirror/README.txt index 3b236d9..b4884e5 100644 --- a/jobo-mirror/README.txt +++ b/jobo-mirror/README.txt @@ -1,26 +1,25 @@ - OSDN services have become a major obstacle to our work - and we sincerely regret relying on them, but seeking other - such service has proved more difficult than we thought. - At this time and since July 9th 2023 uloads have been - blocked, although their mirrors now work and seem - synchronized. To keep users alert of ongoing work - and upgrades we have swithced to a temporary solution - with disroot which is 100% reliable but limited. - - Since OSDN is more down than up we are in search for new file/binary - repositories and mirrors. Meanwhile, as a source repository - git.disroot.org has been 100% reliable, but the total amount of - files stores is limited. This disroot repository only holds - the repository databases, not the packages themselves. In lack - of another solution you will have to build any updates to your - system using our source, as explained in the wiki. - the 3 OSDN mirrors below will be functional once OSDN resumes - service, so comment out disroot and uncomment the other three - when it is announced in Joborun's webpage (news) or reddit - r/joborun board. Sorry for the inconvenience, this is the - best we can do at the moment given the resources available to us. - +## We 1st moved from OSDN because it is falling apart to +## SourceForge, which does not allow pkg names with a : in them +## causing us further headaches, which we temporarily fixed +## by adding all 37 affected pkgs to a tarball and having you +## run a script to download them and place them in cache. +## +## Finally we found a solution, as pacman is much smarter +## than we expected, disregarding the name of the pkg and +## reading pkg name epoch version and release from inside +## the pkg. So we can call a pkg kookoo.not-here and +## install it and it will register as its proper name and +## version. So we did exactly this, rename pkgs to fit +## SourceForge Microsoftish servers and rerun the pacman +## databases with the new names. +## +## In case something goes wrong in the future with SF mirrors +## revert manually in your pacman.conf to this disroot +## server holding just the databases, pacman, and jobo-mirror +## pkgs. +## # pacman database only, no packages to download + Server = https://git.disroot.org/joborun-pkg/repos/raw/branch/main/ # osdn mirrors once they become available for uploads again @@ -30,13 +29,3 @@ Server = https://git.disroot.org/joborun-pkg/repos/raw/branch/main/ #Server = https://free.nchc.org.tw/osdn/storage/g/j/jo/joborun/repos/ #Server = https://osdn.net/projects/joborun/storage/repos/ - -## Unfortunately SourcForge mirrors only partially work -## which is the same as not working. The reason is that SF doesn't -## allow a : in their filesystem, being MS-Win oriented, and -## without knowing this when we uploaded, SF translates all : in -## the pkg name into an _ therefore pkgs like gtk3 or grub -## will not be found and you get a 404 errro trying to install them -## So we are back to square one. Waiting for OSDN mirrors to -## become operational again. - diff --git a/jobo-mirror/mirrorlist-jobo b/jobo-mirror/mirrorlist-jobo index 2b1937c..ba2870f 100644 --- a/jobo-mirror/mirrorlist-jobo +++ b/jobo-mirror/mirrorlist-jobo @@ -1,31 +1,12 @@ -# Since OSDN is more down than up we are in search for new file/binary -# repositories and mirrors. Meanwhile, as a source repository -# git.disroot.org has been 100% reliable, but the total amount of -# files stores is limited. This disroot repository only holds -# the repository databases, not the packages themselves. In lack -# of another solution you will have to build any updates to your -# system using our source, as explained in the wiki. - # ### pacman database only, no packages to download # Server = https://git.disroot.org/joborun-pkg/repos/raw/branch/main/ - -## Unfortunately the following mirrors only partially work -## which is the same as not working. The reason is that SF doesn't -## allow a : in their filesystem, being MS-Win oriented, and -## without knowing this when we uploaded, SF translates all : in -## the pkg name into an _ therefore pkgs like gtk3 or grub -## will not be found and you get a 404 errro trying to install them -## So we are back to square one. Waiting for OSDN mirrors to -## become operational again. - - ##### Start Sourceforge mirrors ##### -# Sourceforge 1 +# Sourceforge 1 # a cloud catch all repo forwarding you to the nearest Server = http://downloads.sourceforge.net/joborun/r -# Sourceforge 2 +# Sourceforge 2 # France Server = http://freefr.dl.sourceforge.net/sourceforge/joborun/r -# Sourceforge 3 +# Sourceforge 3 # Germany Server = http://netcologne.dl.sourceforge.net/sourceforge/joborun/r # Sourceforge 4 Server = http://newcontinuum.dl.sourceforge.net/sourceforge/joborun/r