From df6757d6a02aefebddef002a061a9bc9263a8c93 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 26 Oct 2015 14:41:04 +0900 Subject: Adding gnome-initial-setup and dependencies to gnome stratum This change adds the following chunks to the gnome stratum: o cracklib o libpwquality (uses cracklib to provide password strength checking) o librest (RESTful API library, needed by online accounts) o krb5 (Kerberos Network Authentication) o gnome-online-accounts o gnome-initial-setup Additionally, evolution-data-server is now compiled with online account support - all of the above dependencies are hard requirements for the gnome initial setup tool. The WebKitGtk stratum is now a dependency of GNOME and is also added to the GNOME system with this commit (again required by the gnome-online-accounts module). Change-Id: I103402bc9125b1e9ca57b393b1cef6fb99f526e3 --- strata/gnome.morph | 91 ++++++++++++++++++++++++-------- strata/gnome/cracklib.morph | 18 +++++++ strata/gnome/evolution-data-server.morph | 2 +- strata/gnome/gnome-initial-setup.morph | 7 +++ strata/gnome/gnome-online-accounts.morph | 5 ++ strata/gnome/krb5.morph | 10 ++++ strata/gnome/libpwquality.morph | 6 +++ 7 files changed, 117 insertions(+), 22 deletions(-) create mode 100644 strata/gnome/cracklib.morph create mode 100644 strata/gnome/gnome-initial-setup.morph create mode 100644 strata/gnome/gnome-online-accounts.morph create mode 100644 strata/gnome/krb5.morph create mode 100644 strata/gnome/libpwquality.morph diff --git a/strata/gnome.morph b/strata/gnome.morph index 0a56b520..bca37357 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -320,6 +320,41 @@ chunks: repo: upstream:gnome/libsecret ref: 4d76cf7dd8e55d93bb58164a1fff38113ba97af5 unpetrify-ref: master +- name: librest + repo: upstream:gnome/librest + ref: 08f1fc35e3c77aecedacf08aa510e82c91ac7f2a + unpetrify-ref: 0.7.93 + build-system: autotools +- name: enchant + repo: upstream:enchant + ref: 6d8b6bb15f09a14c90fb900eb2ecf1172d7cf6cf + unpetrify-ref: master + build-system: autotools +- name: hyphen + repo: upstream:hyphen + ref: 7f28cf7edb54cc1bc4eaa09672e0bc043b1da70b + unpetrify-ref: master + build-system: autotools +- name: WebKitGtk + morph: strata/gnome/WebKitGtk.morph + repo: upstream:WebKitGtk-tarball + ref: e15dd966d523731101f70ccf768bba12435a0208 + unpetrify-ref: webkitgtk-2.10.2 + build-depends: + - enchant + - geoclue + - hyphen + - libnotify + - libsecret +- name: gnome-online-accounts + morph: strata/gnome/gnome-online-accounts.morph + repo: upstream:gnome/gnome-online-accounts + ref: 167ada60a66a0ed851bb65335a46570cf071115a + unpetrify-ref: baserock/3.18.1 + build-depends: + - librest + - telepathy-glib + - WebKitGtk - name: evolution-data-server morph: strata/gnome/evolution-data-server.morph repo: upstream:evolution-data-server @@ -329,6 +364,7 @@ chunks: - gcr - libgweather - libsecret + - gnome-online-accounts - name: gnome-shell morph: strata/gnome/gnome-shell.morph repo: upstream:gnome/gnome-shell @@ -345,6 +381,7 @@ chunks: - polkit - startup-notification - telepathy-glib + - network-manager-applet - name: gnome-session morph: strata/gnome/gnome-session.morph repo: upstream:gnome/gnome-session @@ -423,27 +460,6 @@ chunks: - iso-codes - libsecret - libnotify -- name: enchant - repo: upstream:enchant - ref: 6d8b6bb15f09a14c90fb900eb2ecf1172d7cf6cf - unpetrify-ref: master - build-system: autotools -- name: hyphen - repo: upstream:hyphen - ref: 7f28cf7edb54cc1bc4eaa09672e0bc043b1da70b - unpetrify-ref: master - build-system: autotools -- name: WebKitGtk - morph: strata/gnome/WebKitGtk.morph - repo: upstream:WebKitGtk-tarball - ref: e15dd966d523731101f70ccf768bba12435a0208 - unpetrify-ref: webkitgtk-2.10.2 - build-depends: - - enchant - - geoclue - - hyphen - - libnotify - - libsecret - name: nettle morph: strata/gnome/nettle.morph repo: upstream:nettle @@ -466,3 +482,36 @@ chunks: build-system: autotools build-depends: - gnutls +- name: cracklib + morph: strata/gnome/cracklib.morph + repo: upstream:cracklib + ref: 1dd5ca2114c0dd478b17e68e38d2c9f7094552cc + unpetrify-ref: cracklib-2.9.6 +- name: libpwquality + morph: strata/gnome/libpwquality.morph + repo: upstream:libpwquality + ref: 24937f6fdcc1673e064c9626407c89f58289957d + unpetrify-ref: libpwquality-1.3.0 + build-depends: + - cracklib +- name: krb5 + morph: strata/gnome/krb5.morph + repo: upstream:krb5 + ref: db2acb6b06e469c6c12476bec68acc7964626523 + unpetrify-ref: master +- name: gnome-initial-setup + morph: strata/gnome/gnome-initial-setup.morph + repo: upstream:gnome/gnome-initial-setup + ref: b45052856e406d6526ef4d32f4346e43c50cd58a + unpetrify-ref: 3.18.0 + build-depends: + - accountsservice + - gdm + - gnome-desktop + - gnome-keyring + - gnome-online-accounts + - iso-codes + - krb5 + - libgweather + - libpwquality + - network-manager-applet diff --git a/strata/gnome/cracklib.morph b/strata/gnome/cracklib.morph new file mode 100644 index 00000000..6b373cfa --- /dev/null +++ b/strata/gnome/cracklib.morph @@ -0,0 +1,18 @@ +name: cracklib +kind: chunk +build-system: autotools +configure-commands: +# cracklib has it's own autogen.sh script, but uses curl to download config.sub & config.guess, we just skip it +- cd src && autopoint -f && cd m4 && echo EXTRA_DIST = *.m4 > Makefile.am && cd .. && autoreconf -f -i +- cd src && ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-default-dict=/lib/cracklib/pw_dict +build-commands: +- make -C src +- make -C words +install-commands: +- make -C src install +- install -m644 -D words/cracklib-words.gz $DESTDIR$PREFIX/share/dict/cracklib-words.gz +- install -v -m755 -d $DESTDIR/lib/cracklib +system-integration: + cracklib-misc: + 00-cracklib-create-dict: + - create-cracklib-dict /usr/share/dict/cracklib-words.gz diff --git a/strata/gnome/evolution-data-server.morph b/strata/gnome/evolution-data-server.morph index 4a3841a1..5e7cd56a 100644 --- a/strata/gnome/evolution-data-server.morph +++ b/strata/gnome/evolution-data-server.morph @@ -2,4 +2,4 @@ name: evolution-data-server kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-goa --disable-uoa --with-libdb=no --disable-google --with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-uoa --with-libdb=no --disable-google --with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr diff --git a/strata/gnome/gnome-initial-setup.morph b/strata/gnome/gnome-initial-setup.morph new file mode 100644 index 00000000..1f6f695b --- /dev/null +++ b/strata/gnome/gnome-initial-setup.morph @@ -0,0 +1,7 @@ +name: gnome-initial-setup +kind: chunk +build-system: autotools +system-integration: + gnome-initial-set-misc: + 01-add-gnome-initial-setup-user: + - useradd -c "GNOME Initial Setup Owner" -g gdm -s /bin/false gnome-initial-setup diff --git a/strata/gnome/gnome-online-accounts.morph b/strata/gnome/gnome-online-accounts.morph new file mode 100644 index 00000000..0dea9543 --- /dev/null +++ b/strata/gnome/gnome-online-accounts.morph @@ -0,0 +1,5 @@ +name: gnome-online-accounts +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-gtk-doc --disable-documentation diff --git a/strata/gnome/krb5.morph b/strata/gnome/krb5.morph new file mode 100644 index 00000000..d0a4600e --- /dev/null +++ b/strata/gnome/krb5.morph @@ -0,0 +1,10 @@ +name: krb5 +kind: chunk +build-system: autotools +configure-commands: +- cd src && ./util/reconf --force +- cd src && ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var/lib --enable-dns +build-commands: +- make -C src +install-commands: +- make -C src install diff --git a/strata/gnome/libpwquality.morph b/strata/gnome/libpwquality.morph new file mode 100644 index 00000000..aefed50d --- /dev/null +++ b/strata/gnome/libpwquality.morph @@ -0,0 +1,6 @@ +name: libpwquality +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-securedir=/lib/security --disable-nls -- cgit v1.2.1