Index: client/1.0/neutral/pkgd.eagle ================================================================== --- client/1.0/neutral/pkgd.eagle +++ client/1.0/neutral/pkgd.eagle @@ -40,14 +40,14 @@ # # NOTE: The fallback URN, relative to the base URI, where the Package # Signing Keys may be downloaded. This should only be used when # the primary URN did not produce valid data. # - variable openPgpKeyUrnFallback; # DEFAULT: pkg_keys_mirror_1 + variable openPgpKeyUrnFallback1; # DEFAULT: pkg_keys_mirror_1 - if {$force || ![info exists openPgpKeyUrnFallback]} then { - set openPgpKeyUrnFallback pkg_keys_mirror_1 + if {$force || ![info exists openPgpKeyUrnFallback1]} then { + set openPgpKeyUrnFallback1 pkg_keys_mirror_1 } # # NOTE: The URN, relative to the base URI, where a login request may # be sent. @@ -137,14 +137,14 @@ # NOTE: The fallback URI where the Package Signing Keys may be # downloaded. This should return a payload containing the OpenPGP # key data. This should only be used when the primary URN did not # produce valid OpenPGP key data. # - variable openPgpKeyUriFallback; # DEFAULT: .../${openPgpKeyUrnFallback} + variable openPgpKeyUriFallback; # DEFAULT: .../${openPgpKeyUrnFallback1} if {$force || ![info exists openPgpKeyUriFallback]} then { - set openPgpKeyUriFallback {${baseUri}/${openPgpKeyUrnFallback}} + set openPgpKeyUriFallback {${baseUri}/${openPgpKeyUrnFallback1}} } # # NOTE: The URI where a login request may be sent. This should return a # payload containing the necessary HTTP(S) cookie information. @@ -314,22 +314,32 @@ # proc useServerId { {serverId ""} } { variable downloadUrn variable loginUrn variable logoutUrn + variable openPgpKeyUrn + variable openPgpKeyUrnFallback1 + variable platformsUrn ::PackageRepository::verifyServerId $serverId if {[string length $serverId] > 0} then { # - # NOTE: Set the URN variables to values that should cause the - # specified server Id to be used (assume the server Id - # itself is valid and active). + # NOTE: Reset the URN variables to values that should cause + # the specified server Id to be used (assume the server + # Id itself is valid and active). # - set loginUrn [appendArgs pkgd_login_ $serverId] + # HACK: These prefixes are hard-coded and must be manually kept + # synchronized with those in the setupDownloadServerVars + # procedure. + # set downloadUrn [appendArgs pkgd_file_ $serverId] + set loginUrn [appendArgs pkgd_login_ $serverId] set logoutUrn [appendArgs pkgd_logout_ $serverId] + set openPgpKeyUrn [appendArgs pkg_keys_ $serverId] + set openPgpKeyUrnFallback1 [appendArgs pkg_keys_mirror_1_ $serverId] + set platformsUrn [appendArgs pkgd_platforms_ $serverId] } else { # # NOTE: Forcibly reset URN variables to their default values. # setupDownloadServerVars true @@ -520,11 +530,11 @@ proc downloadAndSaveOpenPgpKeyFile { fileName } { variable baseUri variable openPgpKeyUri variable openPgpKeyUriFallback variable openPgpKeyUrn - variable openPgpKeyUrnFallback + variable openPgpKeyUrnFallback1 set errors [list] foreach substUri [list $openPgpKeyUri $openPgpKeyUriFallback] { # Index: client/1.0/neutral/pkgd.eagle.asc ================================================================== --- client/1.0/neutral/pkgd.eagle.asc +++ client/1.0/neutral/pkgd.eagle.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJZWATvAAoJEFAslq9JXcLZmO8QAIsDwUkYGbRhIWh0igBLrjDk -RjiaWFdb96iHGcIftId6r9N+WTBLgqHk52eNa72HbAXIBL/cJ9qx4dj3k4QduP7r -h9La3yyzYsODrVWDODvd/v4OP9nSsizQUml10cE2j4B7Y52czYGm5NrvUi9bjUkX -AEkCowLjdVQmSOW/3sNqyU7TjbwdP/qRrKRvLwr6emxWb58f79BdEd7cXk4M2eT8 -adSfI05qMwgw8h/0RIoSrluEHebrii/d/Q1Vp4Pm1gEBQ4v0m8Q4jqtMZpBX1KNw -umDdeCtjE1yihVxJdsR7HdaxpB9yZkqlFfSJpr5d2Dxx202f4QuYzL6Cy3LLxRuK -dMwhDOc2wltYyprD4Op0yInu0DcUg7nK2PlZ7LAIdoX11EcZLo2JCMVDtOVcQE9e -IqVEPlm62ejrtdJ2nbjBWBvsZU8tfjlaA202OLJfpZ9Xu9QIYEjNa1rPqARwUY4G -7LPGHZV4G8euE8mMMCR5XMeUl4wvE5OKdMDjPTatq5s1cei83JM9qvZi2xvpVN1d -KpF0C8GUbv4Z+lNcFEp5eEtf4/38p49CLU9gFFcgj0Ms1yHFBYqCm7TrN9lG527y -Txu+yArv22IdDrfWduVaw8c/tRCuyP7zl3hPb8PKAhvbwBXKXggiRocCT0bWlGjg -SVkO4hsVMeXzY7LatZ1R -=Oki/ +iQIcBAABCAAGBQJZXVbRAAoJEFAslq9JXcLZbLsQAMFZs0051Kv+nZBDbDRhqHIm ++zoHA50Grc7EQAmAsI5p7jnk8a5gCy0iToIykdxKAozYcJZP7YDWNvpTzc3GDBNA +nNIJpZYRAoQB/ZH9WnlCuIFUXttyY+qtyYUJ92P2c8pPCX1xdVCZck1COGLvOU8f +ZyoUCaYbK+2hHh5GoZMapuJnB7Vf4ahPSXHYCwwadWNmQY464ZfwppzqcuZX+6rj +KQoR9xfBT6aGkT9cdK5wtIJnW2my5iZTA8Yu3KUQ4TiWmIah3D4NISehQwQa6370 +IomaLeKpusC5+N29TKMvWLoeaJXT72xdgjcKkqesFq4uqLMZDA6OMGq09VP/sNP6 +OQf1FcF6fzqq/nqXZpnMItiwwNZYfuS1PrvNDkxw02QYC0r3kDFb4wFLKZO0BbZ9 +KW8m+chWCp6SECbGI7j3UDGSQDe+MeYhHFBE6765gzVh7nAmXA8hn3thL2miuviG +2ZOkKKSXJ8bVDzo8Te9UDmwZu1mkEJw3N9BorX9gGoQ1ZGYZuN75xSMAeK6rDM9h +QGckSIAFEp98p+bUTYytOdTRZJ6u5zdgGtDONdRfQ0h5pzfnlyqHU5JoqXWKTgO6 +gOwyw+BLW2UGbVsJh8x6nhrEch4QVcOPWtS01PVOD41PaLT14xgDDl6pZiaKdV9M +1C+3VXTYk4mTNls+U4s8 +=DPNl -----END PGP SIGNATURE----- Index: client/1.0/neutral/pkgd.eagle.harpy ================================================================== --- client/1.0/neutral/pkgd.eagle.harpy +++ client/1.0/neutral/pkgd.eagle.harpy @@ -19,50 +19,50 @@ None Mistachkin Systems - dd78003f-f517-41af-b923-bb517e62b42a + 2d19e162-f160-461d-9d92-4bb3f55fc49f SHA512 Script - 2017-07-01T20:23:53.1237500Z + 2017-07-05T21:13:55.3203125Z -1.00:00:00 0x9559f6017247e3e2 - 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 Index: client/1.0/neutral/pkgd.eagle.harpy.asc ================================================================== --- client/1.0/neutral/pkgd.eagle.harpy.asc +++ client/1.0/neutral/pkgd.eagle.harpy.asc @@ -1,18 +1,18 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository -iQIcBAABCAAGBQJZWATxAAoJEFAslq9JXcLZ4JcP/Aulat5GGiww8yUwlMmK6Yus -b8da/X31mGpYffqNdYGgLgjbK2/SU/kcbl3X5r3rxjlSmsKmoL+AfjQP2W0a97xP -Wy4t52l3quybL5Cb+luztBLoqR4TaSgKuRtDW85GKFIpBRAmRvJtzQ8oauy8nhva -QQlJVwF+SKUpj5Sr0ntxDYrtYni0ByoWV2eprdB276xsYsSkZGMzKlOakhVJVJIs -zQ6tcPE+x50zqw8D1hoT3o9Vc4itTeIU6/IhAST2tBUrulq443XRo25kxXTw9xeS -R91VvuyfeMRXy6HguoNmE+rtihBSwZepNRjbAMWz+QmXByyM1bWefffr0N7TMROu -jOXLW1vmF3ckEERKfcKcHhqC88UFxBrnhTJegCZPu+CV9PFb1GOCzS3Uy1oA9nBA -pgiBT9TwETplH4WRD+8nX6uU+oXJ/3Wxud8pXM22DmFcQ3aeajwA8Me4GEomH4k+ -KZMFBRZKU1EgwURqi6XWnXyO20r4OMXZgakaritXX9Ryp8ZJ91Ku37yZKnonN68A -vEm2PpRpWOxXyMFThT58upfY0QcgTHFESrytuRPhhLWD5N+3AqJyg7aRnksAx+DP -sNBCuDzkFT5B71nqk9SWebmkIvdey/uZJTaI8zS/Rr8hZ0BqsV2Qav0qg5S0QeEj -1cvKa5DDkdKJWLzgO9MF -=GowX +iQIcBAABCAAGBQJZXVbSAAoJEFAslq9JXcLZKKMP/2Zxipv35Xi4JAz9gASdYmUN +dzd7g+gBxIwVUNwa/CjoFLDmzMqfEjsxcJBqJdjSQsXf3927Gu7/fZWLGf7FIv0t +Qj82coqA6qQY9UfSc0g2yLlNA6wNUHvJkmKe/l3Vfy2V8/TJbFpevz3PwMoZh6mW +Z2KGGCtTfVMBcDV+E25zOGtQa2vxGFJvvP0F2NQab3LCBPIrzJCQ97snS7E3u61f +SWeljqmUUTAzEktj/AMWwBpsNEJwt7KzCgwcJ5IuzsUfLVlZIKKAoOyAcpDNX17k +wDscww9nADu8WVSZzRv4lHIvLvZISVnHUVGzCDyOlRtoARg7Aci3ph0S/l0Xc3WV +OZ4BiQpUJmqu5cagJHcLth5IHjhBHgpT/c5qJCq9xVVT3WBOeAZH44FbIz/rpr5e +lrFPee7NVvBRxq0dNwKYeomKXhueyQ16ZQ70sPlAbu2uNfLXnpmuD6tHB7quEPk+ +bHWkebsHTw5EDDUQiBBcGu6OD+Y6oS084PPfv1PEFA3+9459IakUi3qRCbxhs+iq +wfHAaYflvxVq446EZKv7/H/kymmMthlWWHn4J5yc0xcSJE3kkie2VobQSSSk4my5 +Kjr2d/95Z1eagOUeOLpbYa+qFlAoQ8ETc4Fk2Fl3Kx98c67u4iXzrdeWqqTgBno+ +GeaX9Twvi4Skh/YLMLBe +=jN/w -----END PGP SIGNATURE-----