component/nss, component/nspr: cleanup.

component/nspr/buildout.cfg

@@ -4,28 +4,12 @@ extends =
 
 parts = nspr
 
-[nspr-pkgconfig-patch-download]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-filename = nspr-4.8.6-pkgconfig-1.patch
-url = http://www.linuxfromscratch.org/patches/blfs/svn/${:filename}
-md5sum = 7c00beff0475314f59214842509e407f
-download-only = true
-
 [nspr]
 recipe = slapos.recipe.cmmi
-url = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.7/src/nspr-4.8.7.tar.gz 
-md5sum = 97e30989a56ab813453b71261849c200 
-patches = ${nspr-pkgconfig-patch-download:location}/${nspr-pkgconfig-patch-download:filename}
-patch-options = -p1
-configure-command =
-  cd mozilla/nsprpub
-  ./configure
+url = https://ftp.mozilla.org/pub/nspr/releases/v4.13.1/src/nspr-4.13.1.tar.gz
+md5sum = 9c44298a6fc478b3c0a4e98f4f9981ed
+configure-command = nspr/configure
 configure-options =
   --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-  --with-mozilla
   --enable-64bit
-make-options =
-  -C mozilla/nsprpub
-environment =
-  PATH=${patch:location}/bin:%(PATH)s
+  --enable-ipv6

component/nss/buildout.cfg

 [buildout]
 extends =
-  https://svn.erp5.org/repos/public/erp5/trunk/buildout/software-profiles/zlib.cfg
-  nspr.cfg
-  sed.cfg
-parts =
-  nss
-
-[nss-patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-filename = nss-3.12.9-with-nspr-4.8.7-1.patch
-url = http://www.linuxfromscratch.org/patches/blfs/svn/nss-3.12.8-standalone-1.patch
-md5sum = ee7b5966961bef16ca896435e78652d3
-download-only = true
-
-[nss-download]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_9_RTM/src/nss-3.12.9.tar.gz
-md5sum = bd32f183ca28440c1744650be31a9ccc
-strip-top-level-dir = true
+  ../nspr/buildout.cfg
+  ../sqlite3/buildout.cfg
+  ../zlib/buildout.cfg
 
 [nss]
-recipe = plone.recipe.command
-source = ${nss-download:location}
-destination = ${buildout:parts-directory}/${:_buildout_section_name_}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-compile-location = ${buildout:parts-directory}/${:_buildout_section_name_}_compile_
-stop-on-error = true
-command =
-  rm -rf ${:destination} &&
-  mkdir -p ${:destination} &&
-  rm -rf ${:compile-location} &&
-  cp -R ${:source} ${:compile-location} &&
-  cd ${:compile-location} &&
-  patch -Np1 -i ${nss-patch:location}/${nss-patch:filename} &&
-  ${sed:location}/bin/sed -i "s/ZLIB_LIBS = -lz//g" ${:compile-location}/mozilla/security/coreconf/Linux.mk &&
-  ${sed:location}/bin/sed -i "s/# INCLUDES += -I\/usr\/include -Y\/usr\/include\/linux/INCLUDES += \$(ZLIB_INCLUDE_DIR)/g" ${:compile-location}/mozilla/security/coreconf/Linux.mk &&
-  gmake -C mozilla/security/nss \
-        USE_64=1 \
-        BUILD_OPT=1 \
-        ZLIB_INCLUDE_DIR=-I${zlib:location}/include \
-        ZLIB_LIBS="-lz -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib" \
-        NSPR_INCLUDE_DIR=${nspr:location}/include/nspr \
-        NSPR_LIB_DIR="${nspr:location}/lib -Wl,-rpath=${nspr:location}/lib" \
-        NSSUTIL_LIB_DIR="${:location}/lib -Wl,-rpath=${:location}/lib" \
-        nss_build_all &&
-  mkdir -p ${:destination}/bin &&
-  mkdir -p ${:destination}/include/nss3 &&
-  mkdir -p ${:destination}/lib/pkgconfig &&
-  install -v -m755 ${:compile-location}/mozilla/dist/*.OBJ/lib/*.so ${:destination}/lib &&
-  install -v -m644 ${:compile-location}/mozilla/dist/*.OBJ/lib/{*.chk,libcrmf.a} ${:destination}/lib &&
-  install -v -m755 -d ${:destination}/include/nss &&
-  install -v -m755 ${:compile-location}/mozilla/dist/*.OBJ/bin/{certutil,nss-config,pk12util} ${:destination}/bin &&
-  install -v -m644 ${:compile-location}/mozilla/dist/*.OBJ/lib/pkgconfig/nss.pc ${:destination}/lib/pkgconfig &&
-  cp -v -RL ${:compile-location}/mozilla/dist/{public,private}/nss/* ${:destination}/include/nss &&
-  chmod 644 ${:destination}/include/nss/* &&
-  cd ${buildout:parts-directory} &&
-  rm -rf ${:compile-location}
-
-[nss-cmmi]
 recipe = slapos.recipe.cmmi
-path = ${nss-download:location}/mozilla/security/nss
-configure-command = echo "No need to configure"
-make-binary = gmake
-make-options = USE_64=1
-make-targets = nss_build_all
-
+url = https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_29_RTM/src/nss-3.29.tar.gz
+md5sum = 253d1ae4cf5a560373bbadb4bf483945
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+configure-command = make -j1 -C nss/coreconf/nsinstall all
+# XXX How to build nss-config and pkg-config files ?
+make-options =
+  -j1
+  -C nss
+  NSPR_INCLUDE_DIR="${nspr:location}/include/nspr -I${zlib:location}/include"
+  NSPR_LIB_DIR="${nspr:location}/lib -L${zlib:location}/lib"
+  SQLITE_INCLUDE_DIR=${sqlite3:location}/include
+  SQLITE_LIB_DIR=${sqlite3:location}/lib
+  LDFLAGS="-Wl,-rpath=${:location}/lib -Wl,-rpath=${nspr:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib"
+  all
+post-install =
+  cp -aLr dist/*OBJ/* ${:location}/
+  mkdir -p ${:location}/include
+  cp -aLr dist/public/nss ${:location}/include/
+environment =
+  BUILD_OPT=1
+  USE_64=1
+  NSS_USE_SYSTEM_SQLITE=1