diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-08-07 13:49:34 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-08-07 13:49:34 +0200 |
commit | 4053d79016cec6ea2e0c7502622c0afea340d7ab (patch) | |
tree | 5a9e0ca4f536b469b6178091a98273fe540487b4 /contrib/packages/arch | |
parent | 7fa4d365191d412715b2b10e094702b809604f47 (diff) | |
parent | 18e758f515172a16abcb4264cc5cd970d85a37ab (diff) | |
download | gnunet-4053d79016cec6ea2e0c7502622c0afea340d7ab.tar.gz gnunet-4053d79016cec6ea2e0c7502622c0afea340d7ab.zip |
Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
Diffstat (limited to 'contrib/packages/arch')
-rw-r--r-- | contrib/packages/arch/gnunet/.SRCINFO | 12 | ||||
-rw-r--r-- | contrib/packages/arch/gnunet/PKGBUILD | 12 | ||||
-rw-r--r-- | contrib/packages/arch/gnunet/gnunet-uri.desktop | 9 |
3 files changed, 9 insertions, 24 deletions
diff --git a/contrib/packages/arch/gnunet/.SRCINFO b/contrib/packages/arch/gnunet/.SRCINFO index b7322e210..deb93d6ad 100644 --- a/contrib/packages/arch/gnunet/.SRCINFO +++ b/contrib/packages/arch/gnunet/.SRCINFO | |||
@@ -1,6 +1,6 @@ | |||
1 | pkgbase = gnunet | 1 | pkgbase = gnunet |
2 | pkgdesc = A framework for secure peer-to-peer networking | 2 | pkgdesc = A framework for secure peer-to-peer networking |
3 | pkgver = 0.17.2 | 3 | pkgver = 0.17.3 |
4 | pkgrel = 1 | 4 | pkgrel = 1 |
5 | url = http://gnunet.org | 5 | url = http://gnunet.org |
6 | install = gnunet.install | 6 | install = gnunet.install |
@@ -14,6 +14,8 @@ pkgbase = gnunet | |||
14 | makedepends = pkgconfig | 14 | makedepends = pkgconfig |
15 | makedepends = postgresql | 15 | makedepends = postgresql |
16 | makedepends = python | 16 | makedepends = python |
17 | makedepends = python-sphinx | ||
18 | makedepends = python-sphinx_rtd_theme | ||
17 | depends = brotli | 19 | depends = brotli |
18 | depends = gettext | 20 | depends = gettext |
19 | depends = gnurl | 21 | depends = gnurl |
@@ -50,21 +52,19 @@ pkgbase = gnunet | |||
50 | conflicts = gnunet-git | 52 | conflicts = gnunet-git |
51 | conflicts = gnunet-bin | 53 | conflicts = gnunet-bin |
52 | backup = etc/gnunet.conf | 54 | backup = etc/gnunet.conf |
53 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.2.tar.gz | 55 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.3.tar.gz |
54 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.2.tar.gz.sig | 56 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.3.tar.gz.sig |
55 | source = gnunet-system.service | 57 | source = gnunet-system.service |
56 | source = gnunet.sysusers | 58 | source = gnunet.sysusers |
57 | source = gnunet.tmpfiles | 59 | source = gnunet.tmpfiles |
58 | source = gnunet-uri.desktop | ||
59 | source = gnunet-user.conf | 60 | source = gnunet-user.conf |
60 | source = gnunet-user.service | 61 | source = gnunet-user.service |
61 | validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A | 62 | validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A |
62 | sha256sums = 38b13b578e2490a99222757c64727deb97939fdf797107f986287c2944ee7541 | 63 | sha256sums = 74c767b8d0c34f60ddfa4e77a1657365d34c484b5ffaeb3796e3f520a9d50c9e |
63 | sha256sums = SKIP | 64 | sha256sums = SKIP |
64 | sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262 | 65 | sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262 |
65 | sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755 | 66 | sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755 |
66 | sha256sums = 5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0 | 67 | sha256sums = 5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0 |
67 | sha256sums = 98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7 | ||
68 | sha256sums = 3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2 | 68 | sha256sums = 3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2 |
69 | sha256sums = 60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5 | 69 | sha256sums = 60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5 |
70 | 70 | ||
diff --git a/contrib/packages/arch/gnunet/PKGBUILD b/contrib/packages/arch/gnunet/PKGBUILD index 8973b4144..d04989715 100644 --- a/contrib/packages/arch/gnunet/PKGBUILD +++ b/contrib/packages/arch/gnunet/PKGBUILD | |||
@@ -5,7 +5,7 @@ | |||
5 | # Contributor: wahnby <wahnby AT yahoo DOT fr> | 5 | # Contributor: wahnby <wahnby AT yahoo DOT fr> |
6 | 6 | ||
7 | pkgname='gnunet' | 7 | pkgname='gnunet' |
8 | pkgver='0.17.2' | 8 | pkgver='0.17.3' |
9 | pkgrel=1 | 9 | pkgrel=1 |
10 | pkgdesc='A framework for secure peer-to-peer networking' | 10 | pkgdesc='A framework for secure peer-to-peer networking' |
11 | arch=('i686' 'x86_64') | 11 | arch=('i686' 'x86_64') |
@@ -17,7 +17,7 @@ depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson' | |||
17 | 'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which' | 17 | 'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which' |
18 | 'zlib') | 18 | 'zlib') |
19 | makedepends=('bluez-libs' 'libpulse' 'libtool' 'opus' 'pkgconfig' 'postgresql' | 19 | makedepends=('bluez-libs' 'libpulse' 'libtool' 'opus' 'pkgconfig' 'postgresql' |
20 | 'python') | 20 | 'python' 'python-sphinx' 'python-sphinx_rtd_theme') |
21 | optdepends=('bluez: for bluetooth transport' | 21 | optdepends=('bluez: for bluetooth transport' |
22 | 'gnunet-gtk: for handling the gnunet:// URI scheme' | 22 | 'gnunet-gtk: for handling the gnunet:// URI scheme' |
23 | 'jose: for re:claimID OpenID Connect plugin' | 23 | 'jose: for re:claimID OpenID Connect plugin' |
@@ -37,17 +37,15 @@ source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} | |||
37 | "${pkgname}-system.service" | 37 | "${pkgname}-system.service" |
38 | "${pkgname}.sysusers" | 38 | "${pkgname}.sysusers" |
39 | "${pkgname}.tmpfiles" | 39 | "${pkgname}.tmpfiles" |
40 | "${pkgname}-uri.desktop" | ||
41 | "${pkgname}-user.conf" | 40 | "${pkgname}-user.conf" |
42 | "${pkgname}-user.service") | 41 | "${pkgname}-user.service") |
43 | install="${pkgname}.install" | 42 | install="${pkgname}.install" |
44 | validpgpkeys=('3D11063C10F98D14BD24D1470B0998EF86F59B6A') | 43 | validpgpkeys=('3D11063C10F98D14BD24D1470B0998EF86F59B6A') |
45 | sha256sums=('38b13b578e2490a99222757c64727deb97939fdf797107f986287c2944ee7541' | 44 | sha256sums=('74c767b8d0c34f60ddfa4e77a1657365d34c484b5ffaeb3796e3f520a9d50c9e' |
46 | 'SKIP' | 45 | 'SKIP' |
47 | '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262' | 46 | '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262' |
48 | '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755' | 47 | '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755' |
49 | '5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0' | 48 | '5c34e1ecc6208900426f8e399e8c3edbef12cce19eba605fd7364ddb3547d9f0' |
50 | '98e4e1d6d4fd7c7fd05d9e16402c95f1e7afeb4b97c8c68ac63e8abd11ff4ee7' | ||
51 | '3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2' | 49 | '3f17b9ed2c1f8cc0f919fe477df99678c17778a31f1eeb56517e285e3cef30f2' |
52 | '60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5') | 50 | '60caee20b53bcc69522556b35ac3d35d89e28c49b9a22a2ed5121df4a2c33be5') |
53 | 51 | ||
@@ -91,10 +89,6 @@ package() { | |||
91 | install -Dm644 "${srcdir}/${pkgname}.tmpfiles" \ | 89 | install -Dm644 "${srcdir}/${pkgname}.tmpfiles" \ |
92 | "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" | 90 | "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" |
93 | 91 | ||
94 | install -dm755 "${pkgdir}/usr/share/applications" | ||
95 | install -Dm644 "${srcdir}/${pkgname}-uri.desktop" \ | ||
96 | "${pkgdir}/usr/share/applications/${pkgname}-uri.desktop" | ||
97 | |||
98 | install -dm700 "${pkgdir}/etc/skel/.config" | 92 | install -dm700 "${pkgdir}/etc/skel/.config" |
99 | install -Dm600 "${srcdir}/${pkgname}-user.conf" \ | 93 | install -Dm600 "${srcdir}/${pkgname}-user.conf" \ |
100 | "${pkgdir}/etc/skel/.config/${pkgname}.conf" | 94 | "${pkgdir}/etc/skel/.config/${pkgname}.conf" |
diff --git a/contrib/packages/arch/gnunet/gnunet-uri.desktop b/contrib/packages/arch/gnunet/gnunet-uri.desktop deleted file mode 100644 index 4f847d20f..000000000 --- a/contrib/packages/arch/gnunet/gnunet-uri.desktop +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=GNUnet URI | ||
3 | Exec=gnunet-uri %u | ||
4 | GenericName=URI handler for the GNUnet network | ||
5 | Icon=gnunet | ||
6 | Type=Application | ||
7 | Terminal=false | ||
8 | NoDisplay=true | ||
9 | MimeType=x-scheme-handler/gnunet; | ||