[arch-commits] Commit in cockpit/repos/community-x86_64 (8 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Apr 6 10:05:27 UTC 2020
Date: Monday, April 6, 2020 @ 10:05:26
Author: mtorromeo
Revision: 612047
archrelease: copy trunk to community-x86_64
Added:
cockpit/repos/community-x86_64/PKGBUILD
(from rev 612046, cockpit/trunk/PKGBUILD)
cockpit/repos/community-x86_64/cockpit-ws.sysuser.conf
(from rev 612046, cockpit/trunk/cockpit-ws.sysuser.conf)
cockpit/repos/community-x86_64/cockpit-wsinstance.sysuser.conf
(from rev 612046, cockpit/trunk/cockpit-wsinstance.sysuser.conf)
cockpit/repos/community-x86_64/cockpit.pam
(from rev 612046, cockpit/trunk/cockpit.pam)
Deleted:
cockpit/repos/community-x86_64/PKGBUILD
cockpit/repos/community-x86_64/cockpit-ws.sysuser.conf
cockpit/repos/community-x86_64/cockpit-wsinstance.sysuser.conf
cockpit/repos/community-x86_64/cockpit.pam
---------------------------------+
PKGBUILD | 221 +++++++++++++++++++++-----------------
cockpit-ws.sysuser.conf | 2
cockpit-wsinstance.sysuser.conf | 2
cockpit.pam | 10 -
4 files changed, 130 insertions(+), 105 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-06 10:05:12 UTC (rev 612046)
+++ PKGBUILD 2020-04-06 10:05:26 UTC (rev 612047)
@@ -1,98 +0,0 @@
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Iwan Timmer <irtimmer at gmail.com>
-# Contributor: Mark Constable <markc at renta.net>
-# Contributor: Anatol Pomozov <anatol.pomozov at gmail.com>
-
-pkgbase=cockpit
-pkgname=(cockpit cockpit-pcp cockpit-dashboard)
-pkgver=216
-pkgrel=1
-pkgdesc='A systemd web based user interface for Linux servers'
-arch=('x86_64')
-url='https://cockpit-project.org/'
-license=(LGPL)
-makedepends=(krb5 libssh accountsservice perl-json perl-locale-po json-glib glib-networking
- git intltool gtk-doc gobject-introspection networkmanager libgsystem xmlto npm pcp)
-source=("https://github.com/cockpit-project/cockpit/releases/download/$pkgver/cockpit-$pkgver.tar.xz"
- "https://github.com/cockpit-project/cockpit/releases/download/$pkgver/cockpit-cache-$pkgver.tar.xz"
- "cockpit.pam"
- "cockpit-ws.sysuser.conf"
- "cockpit-wsinstance.sysuser.conf")
-sha256sums=('85fe845fba0c23531fe73e761e090dd6ecb06b389f7dc0c639a5730eb3e940fc'
- '963e1051d575090361f68b4df6e49b0120e77f90cc674217dafbf613cfbd1710'
- 'a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d'
- '1ad9dad75858264778bd94799b60c651f7cc1c7f7fa1c54622174303e639287a'
- '46ee8ecad7bc97ba588ab9471dde76e41c00daf40658902425626c3a1938b438')
-
-build() {
- cd cockpit-$pkgver
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib/$pkgname/ \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-dependency-tracking \
- --with-appstream-data-packages='[ "archlinux-appstream-data" ]' \
- --with-nfs-client-package='"nfs-utils"' \
- --with-cockpit-user=cockpit-ws \
- --with-cockpit-ws-instance-user=cockpit-wsinstance
- make all
-}
-
-package_cockpit() {
- depends=(krb5 libssh accountsservice perl-json perl-locale-po json-glib glib-networking)
- backup=('etc/pam.d/cockpit')
- optdepends=("cockpit-pcp: reading performance metrics"
- "cockpit-dashboard: dashboard and support for connecting to remote hosts"
- "udisks2: manage hard disks"
- "networkmanager: manage network connections"
- "packagekit: manage packages"
- "docker: manage containers"
- "libvirt: manage virtual machines"
- "kubernetes: manage cluster")
-
- cd cockpit-$pkgver
- make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/{src,lib/firewalld}
- install -Dm644 "$srcdir"/cockpit.pam "$pkgdir"/etc/pam.d/cockpit
- install -Dm644 "$srcdir"/cockpit-ws.sysuser.conf "$pkgdir"/usr/lib/sysusers.d/cockpit-ws.conf
- install -Dm644 "$srcdir"/cockpit-wsinstance.sysuser.conf "$pkgdir"/usr/lib/sysusers.d/cockpit-wsinstance.conf
-
- echo "z /usr/lib/cockpit/cockpit-session - - cockpit-wsinstance -" >> "$pkgdir"/usr/lib/tmpfiles.d/cockpit-tempfiles.conf
-
- # remove unused plugins
- rm -rf "$pkgdir"/usr/share/cockpit/{selinux,playground,sosreport} \
- "$pkgdir"/usr/share/metainfo/org.cockpit-project.cockpit-{selinux,sosreport}.metainfo.xml
-
- # remove plugins packaged separately
- rm -rf "$pkgdir"/usr/share/cockpit/{pcp,dashboard} \
- "$pkgdir"/usr/lib/cockpit/cockpit-pcp \
- "$pkgdir"/var/lib/pcp
-}
-
-package_cockpit-pcp() {
- pkgdesc='Cockpit support for reading PCP metrics and loading PCP archives'
- depends=(cockpit pcp)
-
- cd cockpit-$pkgver
- make DESTDIR="$pkgdir"/tmp install
-
- cd "$pkgdir"/tmp
- bsdtar -cf - usr/share/cockpit/pcp usr/lib/cockpit/cockpit-pcp var/lib/pcp \
- | bsdtar -xf - -C "$pkgdir"
- rm -rf "$pkgdir"/tmp
-}
-
-package_cockpit-dashboard() {
- pkgdesc='Cockpit support for connecting to remote servers (through ssh), bastion hosts, and a basic dashboard.'
- depends=(cockpit)
-
- cd cockpit-$pkgver
- make DESTDIR="$pkgdir"/tmp install
-
- cd "$pkgdir"/tmp
- bsdtar -cf - usr/share/cockpit/dashboard \
- | bsdtar -xf - -C "$pkgdir"
- rm -rf "$pkgdir"/tmp
-}
Copied: cockpit/repos/community-x86_64/PKGBUILD (from rev 612046, cockpit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-06 10:05:26 UTC (rev 612047)
@@ -0,0 +1,123 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Iwan Timmer <irtimmer at gmail.com>
+# Contributor: Mark Constable <markc at renta.net>
+# Contributor: Anatol Pomozov <anatol.pomozov at gmail.com>
+
+pkgbase=cockpit
+pkgname=(cockpit cockpit-pcp cockpit-dashboard cockpit-docker cockpit-machines)
+pkgver=216
+pkgrel=2
+pkgdesc='A systemd web based user interface for Linux servers'
+arch=('x86_64')
+url='https://cockpit-project.org/'
+license=(LGPL)
+makedepends=(krb5 libssh accountsservice perl-json perl-locale-po json-glib glib-networking
+ git intltool gtk-doc gobject-introspection networkmanager libgsystem xmlto npm pcp)
+source=("https://github.com/cockpit-project/cockpit/releases/download/$pkgver/cockpit-$pkgver.tar.xz"
+ "https://github.com/cockpit-project/cockpit/releases/download/$pkgver/cockpit-cache-$pkgver.tar.xz"
+ "cockpit.pam"
+ "cockpit-ws.sysuser.conf"
+ "cockpit-wsinstance.sysuser.conf")
+sha256sums=('85fe845fba0c23531fe73e761e090dd6ecb06b389f7dc0c639a5730eb3e940fc'
+ '963e1051d575090361f68b4df6e49b0120e77f90cc674217dafbf613cfbd1710'
+ 'a979e236681c6a06906937cf0f012e976347af5d6d7e7ae04a11acb01cc2689d'
+ '1ad9dad75858264778bd94799b60c651f7cc1c7f7fa1c54622174303e639287a'
+ '46ee8ecad7bc97ba588ab9471dde76e41c00daf40658902425626c3a1938b438')
+
+build() {
+ cd cockpit-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib/$pkgname/ \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-dependency-tracking \
+ --with-appstream-data-packages='[ "archlinux-appstream-data" ]' \
+ --with-nfs-client-package='"nfs-utils"' \
+ --with-cockpit-user=cockpit-ws \
+ --with-cockpit-ws-instance-user=cockpit-wsinstance
+ make all
+}
+
+package_cockpit() {
+ depends=(krb5 libssh accountsservice perl-json perl-locale-po json-glib glib-networking)
+ backup=('etc/pam.d/cockpit')
+ optdepends=("cockpit-pcp: reading performance metrics"
+ "cockpit-dashboard: dashboard and support for connecting to remote hosts"
+ "cockpit-docker: user interface for managing docker containers"
+ "cockpit-machines: user interface for managing virtual machines"
+ "udisks2: manage hard disks"
+ "networkmanager: manage network connections"
+ "packagekit: manage packages"
+ "docker: manage containers"
+ "libvirt: manage virtual machines"
+ "kubernetes: manage cluster")
+
+ cd cockpit-$pkgver
+ make DESTDIR="$pkgdir" install
+ rm -rf "$pkgdir"/usr/{src,lib/firewalld}
+ install -Dm644 "$srcdir"/cockpit.pam "$pkgdir"/etc/pam.d/cockpit
+ install -Dm644 "$srcdir"/cockpit-ws.sysuser.conf "$pkgdir"/usr/lib/sysusers.d/cockpit-ws.conf
+ install -Dm644 "$srcdir"/cockpit-wsinstance.sysuser.conf "$pkgdir"/usr/lib/sysusers.d/cockpit-wsinstance.conf
+
+ echo "z /usr/lib/cockpit/cockpit-session - - cockpit-wsinstance -" >> "$pkgdir"/usr/lib/tmpfiles.d/cockpit-tempfiles.conf
+
+ # remove unused plugins
+ rm -rf "$pkgdir"/usr/share/cockpit/{selinux,playground,sosreport} \
+ "$pkgdir"/usr/share/metainfo/org.cockpit-project.cockpit-{selinux,sosreport}.metainfo.xml
+
+ # remove plugins packaged separately
+ rm -rf "$pkgdir"/usr/share/cockpit/{pcp,dashboard,docker,machines} \
+ "$pkgdir"/usr/share/metainfo/org.cockpit-project.cockpit-{docker,machines}.metainfo.xml \
+ "$pkgdir"/usr/lib/cockpit/cockpit-pcp \
+ "$pkgdir"/var/lib/pcp
+}
+
+package_cockpit-pcp() {
+ pkgdesc='Cockpit support for reading PCP metrics and loading PCP archives'
+ depends=(cockpit pcp)
+
+ cd cockpit-$pkgver
+ make DESTDIR="$pkgdir"/tmp install
+
+ cd "$pkgdir"/tmp
+ bsdtar -cf - usr/share/cockpit/pcp usr/lib/cockpit/cockpit-pcp var/lib/pcp \
+ | bsdtar -xf - -C "$pkgdir"
+ rm -rf "$pkgdir"/tmp
+}
+
+_do_package_component() {
+ _component="${pkgname#cockpit-}"
+
+ cd cockpit-$pkgver
+ make DESTDIR="$pkgdir"/tmp install
+
+ cd "$pkgdir"/tmp
+ bsdtar -cf - usr/share/cockpit/$_component \
+ | bsdtar -xf - -C "$pkgdir"
+
+ [ -f usr/share/metainfo/org.cockpit-project.$pkgname.metainfo.xml ] && \
+ install -Dm644 usr/share/metainfo/org.cockpit-project.$pkgname.metainfo.xml \
+ "$pkgdir"/usr/share/metainfo/org.cockpit-project.$pkgname.metainfo.xml
+
+ rm -rf "$pkgdir"/tmp
+}
+
+package_cockpit-dashboard() {
+ pkgdesc='Cockpit support for connecting to remote servers (through ssh), bastion hosts, and a basic dashboard.'
+ depends=(cockpit)
+ _do_package_component
+}
+
+package_cockpit-docker() {
+ pkgdesc='Cockpit components for interacting with Docker and user interface.'
+ depends=(cockpit docker)
+ _do_package_component
+}
+
+package_cockpit-machines() {
+ pkgdesc='Cockpit components for managing virtual machines.'
+ depends=(cockpit libvirt-dbus)
+ _do_package_component
+}
Deleted: cockpit-ws.sysuser.conf
===================================================================
--- cockpit-ws.sysuser.conf 2020-04-06 10:05:12 UTC (rev 612046)
+++ cockpit-ws.sysuser.conf 2020-04-06 10:05:26 UTC (rev 612047)
@@ -1 +0,0 @@
-u cockpit-ws - "User for cockpit web service"
Copied: cockpit/repos/community-x86_64/cockpit-ws.sysuser.conf (from rev 612046, cockpit/trunk/cockpit-ws.sysuser.conf)
===================================================================
--- cockpit-ws.sysuser.conf (rev 0)
+++ cockpit-ws.sysuser.conf 2020-04-06 10:05:26 UTC (rev 612047)
@@ -0,0 +1 @@
+u cockpit-ws - "User for cockpit web service"
Deleted: cockpit-wsinstance.sysuser.conf
===================================================================
--- cockpit-wsinstance.sysuser.conf 2020-04-06 10:05:12 UTC (rev 612046)
+++ cockpit-wsinstance.sysuser.conf 2020-04-06 10:05:26 UTC (rev 612047)
@@ -1 +0,0 @@
-u cockpit-wsinstance - "User for cockpit-ws instances"
Copied: cockpit/repos/community-x86_64/cockpit-wsinstance.sysuser.conf (from rev 612046, cockpit/trunk/cockpit-wsinstance.sysuser.conf)
===================================================================
--- cockpit-wsinstance.sysuser.conf (rev 0)
+++ cockpit-wsinstance.sysuser.conf 2020-04-06 10:05:26 UTC (rev 612047)
@@ -0,0 +1 @@
+u cockpit-wsinstance - "User for cockpit-ws instances"
Deleted: cockpit.pam
===================================================================
--- cockpit.pam 2020-04-06 10:05:12 UTC (rev 612046)
+++ cockpit.pam 2020-04-06 10:05:26 UTC (rev 612047)
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth include system-remote-login
-account include system-remote-login
-password include system-remote-login
-session include system-remote-login
Copied: cockpit/repos/community-x86_64/cockpit.pam (from rev 612046, cockpit/trunk/cockpit.pam)
===================================================================
--- cockpit.pam (rev 0)
+++ cockpit.pam 2020-04-06 10:05:26 UTC (rev 612047)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-remote-login
+account include system-remote-login
+password include system-remote-login
+session include system-remote-login
More information about the arch-commits
mailing list