* [gentoo-commits] dev/bircoph:master commit in: net-fs/openafs-kernel/files/, net-fs/openafs-kernel/, net-fs/openafs/
@ 2015-03-21 9:38 Andrew Savchenko
0 siblings, 0 replies; only message in thread
From: Andrew Savchenko @ 2015-03-21 9:38 UTC (permalink / raw
To: gentoo-commits
commit: e11e5cde57e2ffb04386a6327132f4163e6513b2
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 09:25:27 2015 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Mar 21 09:25:27 2015 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=e11e5cde
openafs: version bump for pre-tree testing
net-fs/openafs-kernel/ChangeLog | 7 +-
net-fs/openafs-kernel/Manifest | 12 +--
.../openafs-kernel/files/openafs-kernel-3.17.patch | 111 ---------------------
net-fs/openafs-kernel/metadata.xml | 15 +++
...-1.6.10.ebuild => openafs-kernel-1.6.11.ebuild} | 50 ++++++++--
net-fs/openafs/ChangeLog | 7 +-
net-fs/openafs/Manifest | 12 +--
net-fs/openafs/metadata.xml | 15 +++
...openafs-1.6.10.ebuild => openafs-1.6.11.ebuild} | 26 +++--
9 files changed, 110 insertions(+), 145 deletions(-)
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index e43408e..d699b02 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-fs/openafs-kernel
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.162 2013/10/15 19:11:13 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.163 2015/03/17 18:47:57 bircoph Exp $
+
+ 17 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
+ Update maintainers information.
15 Oct 2013; Julian Ospald <hasufell@gentoo.org>
openafs-kernel-1.6.5-r2.ebuild:
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 5c7df98..e7d8b13 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,6 +1,6 @@
-AUX openafs-kernel-3.17.patch 4230 SHA256 de083e9f8f202e65cd7cfc4286bf3a84d7b9c8d7c48ee1da893b11ec1096564e SHA512 b4752bdda7f8ab8b75f2211825aec2ea73756c61af70583271f01d1a4898fe629c6be4b29d4dafb063a3bcd6121149f4c2edc7c355afe8bdc1f8d8a1b2735e58 WHIRLPOOL 663bfc14f709f27d8529f3762afb18c7836abf864b275db572be582c237f9312e94c4d906ee6c6f1951eb1360cc45c067a2be0846c52f3b96c6749908dce074d
-DIST openafs-1.6.10-src.tar.bz2 14592958 SHA256 09b3c4f9500107c6e1cb737a5642e50f338d6acb0579e5e03c772cba1c6f1276 SHA512 934bda43601bf19e971d3bf02332bbbe9559da33bab8a84acf6b4e10d712268d1553a4dbcf71dfcfc9b544fb046ae1d8e31e6fed20e69d098b01bfa086f6d25f WHIRLPOOL 34d436467cebae8bb9d93cde65738afa6b707ad8812b3e32323eed8044631f152c9da4a547e9d3673604bbf7836ebf20e70c7adae874fb9c0203723420a463e9
-DIST openafs-1.6.5-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
-EBUILD openafs-kernel-1.6.10.ebuild 2715 SHA256 1c9cd0a9a4805700cd0abe7e92c571a671a0e7feb11c46cdfba9a152a2ad3722 SHA512 3b164dfe944c580a895724c752c3238ee29cebc94cfcb1fbfff32b5c7d0801b888a6ed5bbf522f3bbb5a7857c8a1b1bbd1602598c9d81328e94300cd4765bbe8 WHIRLPOOL e929c97e0b838ba9ea5ed1c61aabd24ae5bf10dc375fa697fde3f436fdf8151ecdc746f0585e746da80a62b4ba7d4f54121eb77ad17595cf99c8573ce880d2d4
-MISC ChangeLog 27355 SHA256 59e1fb1753db8c87aff5719adedc9e7299005a9514f3daeacb0d0747d784500f SHA512 9b0e344635fc1a915de651aa75e82141d94bf4a106ae8817af3d35e45313df2835da65e57d374471c30e96b0219072e89f5b93bee26ca1cb60bc43e976396bb3 WHIRLPOOL c4ac42b8127eb8fb4f530825737552d880b2316ab0a32304c3213cf99f1412815b4359d756f54f0021d2fb9ed5a8cdac0ad5307686918d29366f18e0f242a32d
-MISC metadata.xml 286 SHA256 b3e704b0f9a832001902f16472eafe5d2aa59afbf04b1eb6cf87f927316d87d3 SHA512 203f23847bccc6104cd62343070b5ead629a5033bf88b5468420628189d260f435606f7185c555a9849cee50ca855c370dfcb19426c6bc11b5c2da1b331e693e WHIRLPOOL 3fe5d977e05abd548bc36fa5f9be966e4cc5813f37c7052a57ba921b2540b61fd15d664c385e710ad857615a5643e599fb66fa623a29cb67420ab38a2e1d8730
+DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
+DIST openafs-1.6.11-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
+DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
+EBUILD openafs-kernel-1.6.11.ebuild 3598 SHA256 0ae24f639c43fa55272d22428dda8cf40679240c321762546c39155bda6f7762 SHA512 6c6ac85ed74725de3dd9dbdc90c93d78b67adb13cbc3970ffc4239b89201fa4cfc2d2f6e371d78cdd1d54c5584e2f74dad5d93efd58835edc8fc994206e83ce9 WHIRLPOOL be102c69fb600c54325a827d57c87f6ac8a31a34588281c81839eeca8e38582073eb13817a2dffe7f02b2f715bbccbf48ee91f3f5869778ba5e3aab88322bf57
+MISC ChangeLog 27456 SHA256 a007968bb807bd43b57552bf7fb3c0c10bf5724eb56b7e5f5d5de787be9408b0 SHA512 f8982a0c1be4ba49b1ec3a218cbab1df7494bd37665ccb194859486d5562feef85465498c4a02f983ce2a1f09b07bc6700cc7594f9ece053a75bd4ee0700adb2 WHIRLPOOL 399eb26cd762839426489570b76d64c641ec6bca838665aef501358be2f5f012810097107ca32ae0a2e3dea2a5169b22e641139b3a0c18db4b4ebca1b0d28054
+MISC metadata.xml 777 SHA256 ec3cab4f468a8af1770926801c13d31ba46aba22cacc231eb40510b811c07c2f SHA512 4641468811b7c6cad2111a1b21a890c082e1449ba68ae0703cf5096c7dbbd6b22715f9476d4b714048c9fb0630f651b5f68b10be4da867cbd7f8adcff1a2cfb4 WHIRLPOOL 4b5ebfaefa3631c6eb3ed7bf03278f85d4b95b0c7e7469d55f3603ae26829c210d31b5ca99d0db2392acbb75406ed2108420ecb5444fcbc9dc9575ad017fd3a5
diff --git a/net-fs/openafs-kernel/files/openafs-kernel-3.17.patch b/net-fs/openafs-kernel/files/openafs-kernel-3.17.patch
deleted file mode 100644
index 90e09d7..0000000
--- a/net-fs/openafs-kernel/files/openafs-kernel-3.17.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-commit 8fe527628b9f2f7dfde63208b300fbb68358f49f
-Author: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Tue Sep 9 10:39:55 2014 -0300
-
- Linux 3.17: No more typedef for ctl_table
-
- The typedef has been removed so we need to use the structure
- directly.
-
- Note that the API for register_sysctl_table has also changed
- with 3.17, but it reverted back to a form that existed
- before and the configure tests handle it correctly.
-
- Reviewed-on: http://gerrit.openafs.org/11455
- Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
- Tested-by: BuildBot <buildbot@rampaginggeek.com>
- Reviewed-by: Perry Ruiter <pruiter@sinenomine.net>
- Reviewed-by: Andrew Deason <adeason@sinenomine.net>
- Reviewed-by: D Brashear <shadow@your-file-system.com>
- (cherry picked from commit 6a23ca5b6e8bcaf881be7a4c50bfba72d001e6cd)
-
- Change-Id: Ifb8fc0b9b01d2578c65407608f0e1b3f3b254459
-
-diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c
-index a8f7fac..834e8ad 100644
---- a/src/afs/LINUX/osi_sysctl.c
-+++ b/src/afs/LINUX/osi_sysctl.c
-@@ -34,7 +34,7 @@ extern afs_int32 afs_pct2;
- #ifdef CONFIG_SYSCTL
- static struct ctl_table_header *afs_sysctl = NULL;
-
--static ctl_table afs_sysctl_table[] = {
-+static struct ctl_table afs_sysctl_table[] = {
- {
- #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
- #if defined(CTL_UNNUMBERED)
-@@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = {
- {0}
- };
-
--static ctl_table fs_sysctl_table[] = {
-+static struct ctl_table fs_sysctl_table[] = {
- {
- #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME)
- #if defined(CTL_UNNUMBERED)
-diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
-index b068af5..1759d9e 100644
---- a/src/cf/linux-test4.m4
-+++ b/src/cf/linux-test4.m4
-@@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NOFLAG], [
- AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument],
- [ac_cv_linux_register_sysctl_table_noflag],
- [#include <linux/sysctl.h>],
-- [ctl_table *t; register_sysctl_table (t);],
-+ [struct ctl_table *t; register_sysctl_table (t);],
- [REGISTER_SYSCTL_TABLE_NOFLAG],
- [define if register_sysctl_table has no insert_at head flag],
- [])
-commit ae2cba23d687454821430dca0300430f04c79c02
-Author: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Thu Sep 25 07:52:12 2014 -0300
-
- Linux 3.17: Deal with d_splice_alias errors
-
- In 3.17 the logic in d_splice_alias has changed. Of interest to
- us is the fact that it will now return an EIO error if it finds
- an existing connected directory for the dentry, where it would
- previously have added a new alias for it. As a result the end
- user can get EIO errors when accessing any file in a volume
- if the volume was first accessed through a different path (ex:
- RO path vs RW path).
-
- This commit just restores the old behaviour, adding the directory
- alias manually in the error case, which is what older versions
- of d_splice_alias used to do.
-
- Reviewed-on: http://gerrit.openafs.org/11492
- Tested-by: BuildBot <buildbot@rampaginggeek.com>
- Reviewed-by: Perry Ruiter <pruiter@sinenomine.net>
- Reviewed-by: Andrew Deason <adeason@sinenomine.net>
- Reviewed-by: D Brashear <shadow@your-file-system.com>
- (cherry picked from commit 5815ee92a41cdcf105741d834042a5617dc4c219)
-
- Change-Id: Ie86009ede93255c85fcf640af14c598fe1e42ca9
-
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 7e5cdd1..3ddcf42 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -1529,9 +1529,18 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp)
- /* It's ok for the file to not be found. That's noted by the caller by
- * seeing that the dp->d_inode field is NULL.
- */
-- if (!code || code == ENOENT)
-- return newdp;
-- else
-+ if (!code || code == ENOENT) {
-+ /*
-+ * d_splice_alias can return an error (EIO) if there is an existing
-+ * connected directory alias for this dentry.
-+ */
-+ if (!IS_ERR(newdp))
-+ return newdp;
-+ else {
-+ d_add(dp, ip);
-+ return NULL;
-+ }
-+ } else
- return ERR_PTR(afs_convert_code(code));
- }
-
diff --git a/net-fs/openafs-kernel/metadata.xml b/net-fs/openafs-kernel/metadata.xml
index dac4442..62be499 100644
--- a/net-fs/openafs-kernel/metadata.xml
+++ b/net-fs/openafs-kernel/metadata.xml
@@ -4,7 +4,22 @@
<herd>net-fs</herd>
<herd>proxy-maintainers</herd>
<maintainer>
+ <email>np.hardass@gmail.com</email>
+ <description>proxied maintainer, please assign bugs to</description>
+</maintainer>
+<maintainer>
+ <email>steve@pressers.name</email>
+ <name>Steven Presser</name>
+ <description>proxied maintainer, please CC on bugs</description>
+</maintainer>
+<maintainer>
+ <email>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ <description>maintainer, please CC on bugs</description>
+</maintainer>
+<maintainer>
<email>andrej.filipcic@ijs.si</email>
<name>Andrej Filipcic</name>
+ <description>inactive maintainer</description>
</maintainer>
</pkgmetadata>
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.10.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
similarity index 61%
rename from net-fs/openafs-kernel/openafs-kernel-1.6.10.ebuild
rename to net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
index 9a33517..67fa489 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.10.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
@@ -1,25 +1,34 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild,v 1.2 2013/10/15 19:11:13 hasufell Exp $
+# $Header: $
EAPI="5"
inherit autotools eutils multilib linux-mod versionator toolchain-funcs
MY_PV=$(delete_version_separator '_')
-MY_PN=${PN/-kernel}
-MY_P2="${MY_PN}-1.6.5"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${PN/-kernel}-${MY_PV}"
PVER="1"
+GENTOO_PATCHES="${P/-kernel}-patches-${PVER}.tar.bz2"
DESCRIPTION="The OpenAFS distributed file system kernel module"
HOMEPAGE="http://www.openafs.org/"
# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
- mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
+if [[ ${PV} == *_pre* ]]; then
+ SRC_URI="
+ http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-src.tar.bz2
+ http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
+ "
+else
+ SRC_URI="
+ http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
+ http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+ "
+fi
+SRC_URI="${SRC_URI} mirror://gentoo/${GENTOO_PATCHES}"
LICENSE="IBM BSD openafs-krb5-a APSL-2"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
S=${WORKDIR}/${MY_P}
@@ -32,6 +41,21 @@ ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+pkg_pretend() {
+ if use kernel_linux && kernel_is ge 4 ; then
+ ewarn "Gentoo supports kernels which are supported by OpenAFS"
+ ewarn "which are limited to the following kernel versions:"
+ ewarn "<sys-kernel/gentoo-sources-4.0"
+ ewarn "<sys-kernel/vanilla-sources-4.0"
+ ewarn ""
+ ewarn "You are free to utilize epatch_user to provide whatever"
+ ewarn "support you feel is appropriate, but will not receive"
+ ewarn "support as a result of those changes."
+ ewarn ""
+ ewarn "Please do not file a bug report about this."
+ fi
+}
+
pkg_setup() {
if use kernel_linux; then
linux-mod_pkg_setup
@@ -42,7 +66,6 @@ src_prepare() {
EPATCH_EXCLUDE="012_all_kbuild.patch 020_all_fbsd.patch" \
EPATCH_SUFFIX="patch" \
epatch "${WORKDIR}"/gentoo/patches
- epatch "${FILESDIR}/${PN}-3.17.patch"
epatch_user
# packaging is f-ed up, so we can't run eautoreconf
@@ -56,10 +79,17 @@ src_prepare() {
}
src_configure() {
+ local myconf=""
+ # OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
+ if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+ myconf="--enable-linux-d_splice_alias-extra-iput"
+ fi
+
ARCH="$(tc-arch-kernel)" \
econf \
--with-linux-kernel-headers=${KV_DIR} \
- --with-linux-kernel-build=${KV_OUT_DIR}
+ --with-linux-kernel-build=${KV_OUT_DIR} \
+ ${myconf}
}
src_compile() {
diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 42cd89e..aa6e9de 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-fs/openafs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.198 2013/10/07 20:27:16 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.199 2015/03/17 18:44:55 bircoph Exp $
+
+ 17 Mar 2015; Andrew Savchenko <bircoph@gentoo.org> metadata.xml:
+ Update maintainers information.
07 Oct 2013; Julian Ospald <hasufell@gentoo.org> openafs-1.6.5-r1.ebuild:
add epatch_user as requested by a user
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index da341b8..363c5c3 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,9 +2,9 @@ AUX openafs-client.conf 2967 SHA256 8697386dd67c321240189392483b460443f47bb388ad
AUX openafs-client.service 426 SHA256 07a68694d53c212eb7d61120c421ba43b6506ce34b4da10680a4b626ca18aaa5 SHA512 dc85f13aed5512bafca8f399523d0e0af30f665c293d7b5eb3b59a71327455430ab82a3d3c089769ad8277d4c5175bc5b3e7ce05697a8b0c597187fe046881b2 WHIRLPOOL 141441a4e1cc0233dab97b42c48a45e684dbdbba99fc09e4de29d53a35cdea5592f27e7bfa961424bd4b1c3f0fedba7ee10939e1061b0847ae21c4fbdc987fbb
AUX openafs-server.service 291 SHA256 fac0f11c34d37da33b9aa914678b9b10c8a5a71b23c3d4885abcf9247d3a2242 SHA512 6ca0d45724dd6946202a91527f15f7a62ae9263b3c2e61e3ad7c0c87bda4fd7cc8fe0fd8f656ca497796cc951c010b69939754451958b8dbbaa0c41b41bd9eb6 WHIRLPOOL b9b719ed3566e97d06f4cc9da89555c9444f5c6d5f29087cba8869832206c8709866b3a559dfe91237f2e8bbbf9b517bb0b4167b10630a0f58c1f5a7b80cafc1
AUX tmpfiles.d/openafs-client.conf 22 SHA256 974eb8b845df8e06d517fff7a65f15b4e599af3245aca44eb9f5021d0877ca3f SHA512 ee8daa10c6fac2d05085f74b0a807e27e327124380ae6e642f29bfe0b2f3b3909da3024a1c4f6b86a712e05ed05875d36c3b1cc06543a1f390f713a16a2baca6 WHIRLPOOL 5166e31a4a7f705ea45d49be53016c1e7012db5dd1b4745384c32406e104481ba61196d59d82b9e01e002f7576322cbad33f0e375a7309143a61ac99771c8b1f
-DIST openafs-1.6.10-doc.tar.bz2 3531577 SHA256 7cc67eaa3feb7bc4fafc2339284ca46e160bc8dff4acdbd502cfa6e4f41a8ea4 SHA512 ca6cad90499e6ddc397476e83d7d5f2ee8c87cb1ec976aa3695626f5dc68b6d6e3b8a060bc71c0c15b2fe5a2e1717fb53463b642f45cace7004ff28848f9e26b WHIRLPOOL 9dd237521125eec2225f4f76a8cf595b7fa5d714f7f6f75a05bf2ededc2e0255457717f53c2280f54cda89c22ec536f8d98cb59cdc1ac436c4b5586005650209
-DIST openafs-1.6.10-src.tar.bz2 14592958 SHA256 09b3c4f9500107c6e1cb737a5642e50f338d6acb0579e5e03c772cba1c6f1276 SHA512 934bda43601bf19e971d3bf02332bbbe9559da33bab8a84acf6b4e10d712268d1553a4dbcf71dfcfc9b544fb046ae1d8e31e6fed20e69d098b01bfa086f6d25f WHIRLPOOL 34d436467cebae8bb9d93cde65738afa6b707ad8812b3e32323eed8044631f152c9da4a547e9d3673604bbf7836ebf20e70c7adae874fb9c0203723420a463e9
-DIST openafs-1.6.5-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
-EBUILD openafs-1.6.10.ebuild 4806 SHA256 7e4aaa05f9a4a94ef918305aeb41e943c52d493c7992c55557fe8de8ce623ba2 SHA512 1cca847ae4a7e035a4c8be19ec0f6def97a9af663fad7647e1bb6373fe0313cf64e3e7f8dcc006368af85dd8c0ba5e494f97d7a687596c720af10f9fe987b4e1 WHIRLPOOL 760360a42c47b5f48a9738550338f9652810610f9149e31404588dc0a325c3db7dbcc341851a417c68a1b73b1ceba3db316115c8d518a9c4721085aac92905dd
-MISC ChangeLog 32107 SHA256 83b290ee157be43e2dfbc2a2ead0e62b6576fd16d0fcef60bcdfe6abc5ce61af SHA512 29dd0c352cf9d82cd776ab5521798367e06f33d71f18875cb45b400abd8abfb997f8a507bc27107a53c7068e4d6768a864130e0e6f2477fb623650a246716a35 WHIRLPOOL 9c580de541eceb4371fecaced904f565cde40da84a608d2eec39da9095008f0dd9253e640cde332bcf55d447379ea130dcbe759ffe5967669d5119f04bbcbc20
-MISC metadata.xml 286 SHA256 b3e704b0f9a832001902f16472eafe5d2aa59afbf04b1eb6cf87f927316d87d3 SHA512 203f23847bccc6104cd62343070b5ead629a5033bf88b5468420628189d260f435606f7185c555a9849cee50ca855c370dfcb19426c6bc11b5c2da1b331e693e WHIRLPOOL 3fe5d977e05abd548bc36fa5f9be966e4cc5813f37c7052a57ba921b2540b61fd15d664c385e710ad857615a5643e599fb66fa623a29cb67420ab38a2e1d8730
+DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
+DIST openafs-1.6.11-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
+DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
+EBUILD openafs-1.6.11.ebuild 4898 SHA256 fa7bce2cec61ebedbfe2e8dc191eba7df4574cf87cc58084a15054424aaaef9c SHA512 07061c26d27f7c59073e2afe7e7287c296ac4ec78eae7d86d4efbaa113207743b98883da5100472e98b49f66e1184a00fb86e35e56c6881da2220897ebed144e WHIRLPOOL 3c10b93eba09ca78ee2e9eb9b89cb36b510344b74d1863493bba315cee67464153182e2e33edf404d5513a57a077b204884a1255507fdb9552d79fb6d22341e8
+MISC ChangeLog 32208 SHA256 d60a626da52deca400e0127993098d84d53b43776ea7b979d0cbb193506e875e SHA512 6da1946bd75013ac8330ebc7ae336bc293918e43a5f20611b440a5e925f4d6d99838a52565788dba167c30a4e7bd18d76b4b8aa040a347dce02458745fd2062d WHIRLPOOL 1dd2536264568151d517ab7fec5ea72189144ccfcf409234baee6b68de2b3495ac46845d9b1d9feca9e2783f0887148af9cbe96d28c4cbeb8254a41cbd72a380
+MISC metadata.xml 777 SHA256 ec3cab4f468a8af1770926801c13d31ba46aba22cacc231eb40510b811c07c2f SHA512 4641468811b7c6cad2111a1b21a890c082e1449ba68ae0703cf5096c7dbbd6b22715f9476d4b714048c9fb0630f651b5f68b10be4da867cbd7f8adcff1a2cfb4 WHIRLPOOL 4b5ebfaefa3631c6eb3ed7bf03278f85d4b95b0c7e7469d55f3603ae26829c210d31b5ca99d0db2392acbb75406ed2108420ecb5444fcbc9dc9575ad017fd3a5
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index dac4442..62be499 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -4,7 +4,22 @@
<herd>net-fs</herd>
<herd>proxy-maintainers</herd>
<maintainer>
+ <email>np.hardass@gmail.com</email>
+ <description>proxied maintainer, please assign bugs to</description>
+</maintainer>
+<maintainer>
+ <email>steve@pressers.name</email>
+ <name>Steven Presser</name>
+ <description>proxied maintainer, please CC on bugs</description>
+</maintainer>
+<maintainer>
+ <email>bircoph@gentoo.org</email>
+ <name>Andrew Savchenko</name>
+ <description>maintainer, please CC on bugs</description>
+</maintainer>
+<maintainer>
<email>andrej.filipcic@ijs.si</email>
<name>Andrej Filipcic</name>
+ <description>inactive maintainer</description>
</maintainer>
</pkgmetadata>
diff --git a/net-fs/openafs/openafs-1.6.10.ebuild b/net-fs/openafs/openafs-1.6.11.ebuild
similarity index 87%
rename from net-fs/openafs/openafs-1.6.10.ebuild
rename to net-fs/openafs/openafs-1.6.11.ebuild
index 4c5e211..5582cab 100644
--- a/net-fs/openafs/openafs-1.6.10.ebuild
+++ b/net-fs/openafs/openafs-1.6.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.5-r1.ebuild,v 1.4 2013/10/07 20:27:16 hasufell Exp $
+# $Header: $
EAPI="4"
@@ -9,20 +9,30 @@ inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam s
MY_PV=$(delete_version_separator '_')
MY_P="${PN}-${MY_PV}"
PVER="1"
+GENTOO_PATCHES="${P}-patches-${PVER}.tar.bz2"
DESCRIPTION="The OpenAFS distributed file system"
HOMEPAGE="http://www.openafs.org/"
# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
- http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
- mirror://gentoo/${PN}-1.6.5-patches-${PVER}.tar.bz2"
+if [[ ${PV} == *_pre* ]]; then
+ SRC_URI="
+ http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-src.tar.bz2
+ http://openafs.org/dl/openafs/candidate/${MY_PV}/${MY_P}-doc.tar.bz2
+ "
+else
+ SRC_URI="
+ http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
+ http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+ "
+fi
+SRC_URI="${SRC_URI} mirror://gentoo/${GENTOO_PATCHES}"
LICENSE="IBM BSD openafs-krb5-a APSL-2"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc kerberos pam"
-RDEPEND="|| ( ~net-fs/openafs-kernel-${PV} !net-fs/openafs-kernel )
+RDEPEND="~net-fs/openafs-kernel-${PV}
sys-libs/ncurses
pam? ( sys-libs/pam )
kerberos? ( virtual/krb5 )"
@@ -155,5 +165,5 @@ pkg_postinst() {
elog "(warning: it is not yet up to date wrt the new file locations)"
elog
elog "The documentation can be found at:"
- elog " http://www.gentoo.org/doc/en/openafs.xml"
+ elog " https://wiki.gentoo.org/wiki/OpenAFS"
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-03-21 9:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-21 9:38 [gentoo-commits] dev/bircoph:master commit in: net-fs/openafs-kernel/files/, net-fs/openafs-kernel/, net-fs/openafs/ Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox