update some links and fix brtees

component/bzip2/buildout.cfg

@@ -4,7 +4,7 @@ parts =
 
 [bzip2]
 recipe = slapos.recipe.cmmi
-url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
+url = https://fossies.org/linux/misc/bzip2-1.0.6.tar.gz
 md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b
 configure-command = true
 make-options =

component/ca-certificates/buildout.cfg

@@ -11,9 +11,9 @@ parts =
 
 [ca-certificates]
 recipe = slapos.recipe.cmmi
-url = http://http.debian.net/debian/pool/main/c/ca-certificates/ca-certificates_20161130.tar.xz
+url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20190110.tar.xz
 patch-binary = ${patch:location}/bin/patch
-md5sum = 1a0a3a1b3390dc83affed4b0c2ae1c05
+md5sum = e91d3d9259127ba2dbb65fda58d73f31
 patches =
   ${:_profile_base_location_}/ca-certificates-any-python.patch#087b5e860c7a4b8ff6656c95c5835ee2
   ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b

component/ghostscript/buildout.cfg

@@ -19,7 +19,6 @@ configure-options =
   --without-libidn
   --without-x
   --with-drivers=FILES
-  --with-fontpath=${ghostscript-fonts:location}
 # it seems that parallel build sometimes fails for ghostscript.
 make-options = -j1
 environment =
@@ -36,8 +35,3 @@ environment =
 url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/ghostscript-9.20.tar.xz
 md5sum = 8f3d383d48da22345937b66b01ab2960
 
-[ghostscript-fonts]
-recipe = slapos.recipe.build:download-unpacked
-strip-top-level-dir = false
-url = http://downloads.ghostscript.com/public/fonts/urw-base35-v1.10.zip
-md5sum = 66e8bbd8228519d5dba82b9433a61bb0

component/graphviz/buildout.cfg

@@ -12,8 +12,8 @@ extends =
 
 [graphviz]
 recipe = slapos.recipe.cmmi
-url = http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.38.0.tar.gz
-md5sum = 5b6a829b2ac94efcd5fa3c223ed6d3ae
+url = https://ftp.osuosl.org/pub/blfs/conglomeration/graphviz/graphviz-2.40.1.tar.gz
+md5sum = 4ea6fd64603536406166600bcc296fc8
 pkg_config_depends = ${pango:location}/lib/pkgconfig:${pango:pkg_config_depends}
 configure-options =
   --with-included-ltdl

component/imagemagick/buildout.cfg

@@ -54,7 +54,6 @@ configure-options =
   --without-wmf
   --with-bzlib=${bzip2:location}
   --with-zlib=${zlib:location}
-  --with-gs-font-dir=${ghostscript-fonts:location}
   --with-frozenpaths
 patch-options = -p1
 patches =

component/jemalloc/buildout.cfg

@@ -5,7 +5,8 @@ parts =
 
 [jemalloc]
 recipe = slapos.recipe.cmmi
-url = http://www.canonware.com/download/jemalloc/jemalloc-3.6.0.tar.bz2
+url = https://github.com/jemalloc/jemalloc/releases/download/${:version}/jemalloc-${:version}.tar.bz2
+version = 3.6.0
 md5sum = e76665b63a8fddf4c9f26d2fa67afdf2
 configure-options =
   --disable-static

component/pcre/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [pcre]
 recipe = slapos.recipe.cmmi
-url = http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.40.tar.bz2
-md5sum = 41a842bf7dcecd6634219336e2167d1d 
+url = https://ftp.pcre.org/pub/pcre/pcre-8.42.tar.bz2
+md5sum = 085b6aa253e0f91cae70b3cdbe8c1ac2
 configure-options =
   --disable-static
   --enable-unicode-properties

software/neoppod/software-common.cfg

@@ -45,14 +45,23 @@ eggs = neoppod[admin, ctl, master, storage-mysqldb]
   ${msgpack-python:egg}
   ${python-mysqlclient:egg}
   psutil
-  # XXX: BTrees setup_requires persistent
-  ${python-cffi:egg}
-  persistent
-  BTrees
+  ${BTrees:egg}
   ZODB
   zope.testing
   zodbtools
 
+# XXX: buildout fails to install properly eggs with setup_requires
+[BTrees]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${persistent:egg}
+
+[persistent]
+recipe = zc.recipe.egg:custom
+egg = ${:_buildout_section_name_}
+setup-eggs = ${python-cffi:egg}
+###
+
 [slapos-deps-eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -110,14 +119,14 @@ url = ${:_profile_base_location_}/my.cnf.in
 md5sum = 87d18c7021e4d43756813a83c9da5e97
 
 [versions]
-BTrees = 4.4.1
+BTrees = 4.5.1
 ZODB = 4.4.5
 apache-libcloud = 1.5.0
 ecdsa = 0.13
 gitdb2 = 2.0.0
 msgpack-python = 0.4.8
 mysqlclient = 1.3.10+SlapOSPatched001
-persistent = 4.2.3
+persistent = 4.5.0
 pycrypto = 2.6.1
 pycurl = 7.43.0
 slapos.recipe.template = 3.0

stack/slapos.cfg

@@ -195,9 +195,7 @@ zope.interface = 4.3.3
 [networkcache]
 download-cache-url = http://download.shacache.org/
 download-dir-url = http://dir.shacache.org/
-
 # signature certificates of the following uploaders.
-#   Romain Courteaud
 #   Sebastien Robin
 #   Kazuhiko Shiozaki
 #   Gabriel Monnerat
@@ -206,20 +204,8 @@ download-dir-url = http://dir.shacache.org/
 #   Rafael Monnerat
 #   Ivan Tyagov
 #   Julien Muchembled
+#   Yusei Tahara
 signature-certificate-list =
-  -----BEGIN CERTIFICATE-----
-  MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
-  CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
-  MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
-  ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
-  AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
-  boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
-  Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
-  ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
-  mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
-  q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
-  QUUGLQ==
-  -----END CERTIFICATE-----
   -----BEGIN CERTIFICATE-----
   MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
   BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
@@ -324,3 +310,16 @@ signature-certificate-list =
   SOvU9E1802JN7Q1mrMbgJeNmk+18o4ze7ABKljqtvo+ZjUXthuWw3BNt+PtQjlX3
   5wE+Yc4sypYGmAfU7Gc=
   -----END CERTIFICATE-----
+  -----BEGIN CERTIFICATE-----
+  MIICAjCCAWugAwIBAgIJAP/k6bltwfZCMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+  BAMMDmxvY2FsX2NvbXB1dGVyMCAXDTE3MTEwOTA2NTU1M1oYDzIxMTcxMDE2MDY1
+  NTUzWjAZMRcwFQYDVQQDDA5sb2NhbF9jb21wdXRlcjCBnzANBgkqhkiG9w0BAQEF
+  AAOBjQAwgYkCgYEAuWN8O1PQ23mulMu45fDxTHeoI33MDWDLHP9gthsMbTplftDf
+  k8BAKCp/ugbAkCD5LTx/6RH1RdyM/LApUI/n+fxFnnVZn8Fyuzwu/TlvGdNT5yrj
+  RhBkcxeCpWWz9Ysezj9jVnK+TCSjJeb/N55aMgXAVjrIeJkR4SkPDdMBtcMCAwEA
+  AaNQME4wHQYDVR0OBBYEFJ+1cOY78rvaNAzqshFjVOWfqoMzMB8GA1UdIwQYMBaA
+  FJ+1cOY78rvaNAzqshFjVOWfqoMzMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEL
+  BQADgYEAJDLdo6fXZxEaHYJuZ6XuYPNAYAcSOiSbJoMSSz7qQJ+4FWPGCBnhiZbU
+  SyslQFs59yqNxb046uKi7D4JeUd0zdBO3TtceGRK3iyEFNx8GF+em/6pNnC3A/XH
+  +L1VRZsQdvh7NHsl/dVvWmmlmOANQ/+JkLbe98c/rCmBDH48Ldc=
+  -----END CERTIFICATE-----
\ No newline at end of file