From 1fc39bbd77125612208bd8c69e92fef00f3f1170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 15 Feb 2016 21:08:54 +0000
Subject: Move gnutls to network-security stratum

With the other alternative implementation NSS/NSPR

Change-Id: Ib8a15cffb7371c397b776a5b4e74dd8463341929
---
 strata/gnome.morph                    | 32 --------------------------------
 strata/gnome/gnutls.morph             |  6 ------
 strata/gnome/nettle.morph             |  6 ------
 strata/gnome/p11-kit.morph            |  5 -----
 strata/network-security.morph         | 27 +++++++++++++++++++++++++++
 strata/network-security/gnutls.morph  |  6 ++++++
 strata/network-security/nettle.morph  |  6 ++++++
 strata/network-security/p11-kit.morph |  5 +++++
 8 files changed, 44 insertions(+), 49 deletions(-)
 delete mode 100644 strata/gnome/gnutls.morph
 delete mode 100644 strata/gnome/nettle.morph
 delete mode 100644 strata/gnome/p11-kit.morph
 create mode 100644 strata/network-security/gnutls.morph
 create mode 100644 strata/network-security/nettle.morph
 create mode 100644 strata/network-security/p11-kit.morph

(limited to 'strata')

diff --git a/strata/gnome.morph b/strata/gnome.morph
index d3834b13..a228bf04 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -292,24 +292,10 @@ chunks:
   ref: 07237ff25d6171e1b548118442ddba4259a53ba5
   unpetrify-ref: master
   build-system: autotools
-- name: libtasn1
-  repo: upstream:libtasn1
-  ref: 7f3a9c2294cdebd9e63fe007150c181b980865ef
-  unpetrify-ref: baserock/gnome
-  build-system: autotools
-- name: p11-kit
-  morph: strata/gnome/p11-kit.morph
-  repo: upstream:p11-kit
-  ref: ec9e2450bafa1cda47525b38a28c8f981f43c1e1
-  unpetrify-ref: 0.23.1
-  build-depends:
-  - libtasn1
 - name: gcr
   repo: upstream:gnome/gcr
   ref: 289ba4859fd170285f51e6bbfe91f2aac3b9170d
   unpetrify-ref: 3.18.0
-  build-depends:
-  - p11-kit
   build-system: autotools
 - name: libxkbcommon-x11
   repo: upstream:xorg-lib-libxkbcommon
@@ -563,27 +549,11 @@ chunks:
   ref: e68462edd35ae3edb4311df90dc4d1a3cdcb175f
   unpetrify-ref: baserock/3.18.0-2-ge68462e
   build-system: autotools
-- name: nettle
-  morph: strata/gnome/nettle.morph
-  repo: upstream:nettle
-  ref: 549e2853d6f3fa9cefb099970209c7f5bf5673b7
-  unpetrify-ref: nettle_3.1.1_release_20150424
-- name: gnutls
-  morph: strata/gnome/gnutls.morph
-  repo: upstream:gnutls
-  ref: 21fecbde80ae824f85a10a0c23a327c49e4e5fb6
-  unpetrify-ref: baserock/gnutls_3_4_6
-  build-depends:
-  - nettle
-  - libtasn1
-  - p11-kit
 - name: glib-networking
   morph: strata/gnome/glib-networking.morph
   repo: upstream:gnome/glib-networking
   ref: 32ee55186d7df497e3d402a1940cddfabd9dbc21
   unpetrify-ref: 2.46.0
-  build-depends:
-  - gnutls
 - name: cracklib
   morph: strata/gnome/cracklib.morph
   repo: upstream:cracklib
@@ -609,7 +579,6 @@ chunks:
   ref: aa7120c2e359bb5d6d0b0ec6c1e0eecf0583be03
   unpetrify-ref: 0.43.0
   build-depends:
-  - gnutls
   - glade
 - name: tracker
   repo: upstream:gnome/tracker
@@ -1054,7 +1023,6 @@ chunks:
   - geoclue
   - geocode-glib
   - gnome-online-accounts
-  - gnutls
   - gsettings-desktop-schemas
   - iso-codes
   - libcanberra
diff --git a/strata/gnome/gnutls.morph b/strata/gnome/gnutls.morph
deleted file mode 100644
index f31cbf12..00000000
--- a/strata/gnome/gnutls.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: gnutls
-kind: chunk
-build-system: autotools
-configure-commands:
-- make autoreconf
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-nettle-mini --disable-tools --disable-doc
diff --git a/strata/gnome/nettle.morph b/strata/gnome/nettle.morph
deleted file mode 100644
index 80bdbf51..00000000
--- a/strata/gnome/nettle.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: nettle
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./.bootstrap
-- ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib --sysconfdir=/etc --disable-documentation --enable-mini-gmp
diff --git a/strata/gnome/p11-kit.morph b/strata/gnome/p11-kit.morph
deleted file mode 100644
index 8f88969a..00000000
--- a/strata/gnome/p11-kit.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: p11-kit
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --without-trust-paths
diff --git a/strata/network-security.morph b/strata/network-security.morph
index cf1fd1dc..caf4a08b 100644
--- a/strata/network-security.morph
+++ b/strata/network-security.morph
@@ -1,5 +1,6 @@
 name: network-security
 kind: stratum
+description: This stratum provides SSL/TLS libraries
 build-depends:
 - morph: strata/core.morph
 chunks:
@@ -15,3 +16,29 @@ chunks:
   unpetrify-ref: baserock/nss-3.21
   build-depends:
   - nspr
+- name: libtasn1
+  repo: upstream:libtasn1
+  ref: 7f3a9c2294cdebd9e63fe007150c181b980865ef
+  unpetrify-ref: baserock/gnome
+  build-system: autotools
+- name: p11-kit
+  morph: strata/network-security/p11-kit.morph
+  repo: upstream:p11-kit
+  ref: ec9e2450bafa1cda47525b38a28c8f981f43c1e1
+  unpetrify-ref: 0.23.1
+  build-depends:
+  - libtasn1
+- name: nettle
+  morph: strata/network-security/nettle.morph
+  repo: upstream:nettle
+  ref: 549e2853d6f3fa9cefb099970209c7f5bf5673b7
+  unpetrify-ref: nettle_3.1.1_release_20150424
+- name: gnutls
+  morph: strata/network-security/gnutls.morph
+  repo: upstream:gnutls
+  ref: 21fecbde80ae824f85a10a0c23a327c49e4e5fb6
+  unpetrify-ref: baserock/gnutls_3_4_6
+  build-depends:
+  - nettle
+  - libtasn1
+  - p11-kit
diff --git a/strata/network-security/gnutls.morph b/strata/network-security/gnutls.morph
new file mode 100644
index 00000000..f31cbf12
--- /dev/null
+++ b/strata/network-security/gnutls.morph
@@ -0,0 +1,6 @@
+name: gnutls
+kind: chunk
+build-system: autotools
+configure-commands:
+- make autoreconf
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-nettle-mini --disable-tools --disable-doc
diff --git a/strata/network-security/nettle.morph b/strata/network-security/nettle.morph
new file mode 100644
index 00000000..80bdbf51
--- /dev/null
+++ b/strata/network-security/nettle.morph
@@ -0,0 +1,6 @@
+name: nettle
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./.bootstrap
+- ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib --sysconfdir=/etc --disable-documentation --enable-mini-gmp
diff --git a/strata/network-security/p11-kit.morph b/strata/network-security/p11-kit.morph
new file mode 100644
index 00000000..8f88969a
--- /dev/null
+++ b/strata/network-security/p11-kit.morph
@@ -0,0 +1,5 @@
+name: p11-kit
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --without-trust-paths
-- 
cgit v1.2.1