subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-fs\/reiserfsprogs\/files\/, sys\-fs\/reiserfsprogs\/"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/reiserfsprogs/files/, sys-fs/reiserfsprogs/

2017-07-05 Thread Lars Wendler

commit: 547624bfcfd063cea4c9b7bbabe508a086140f83
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul  5 11:59:00 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul  5 11:59:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547624bf

sys-fs/reiserfsprogs: Don't include sys/acl.h (bug #585978).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/reiserfsprogs-3.6.25-no_acl.patch| 12 
 sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild   | 18 ++
 sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild   |  7 ++-
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch 
b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch
new file mode 100644
index 000..6a3768154cb
--- /dev/null
+++ b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.25-no_acl.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/585978
+
+--- a/reiserfscore/xattr.c
 b/reiserfscore/xattr.c
+@@ -1,7 +1,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ #include "reiserfs_lib.h"
+ 
+ static inline unsigned short from32to16(unsigned int x)

diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild 
b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
index 04cc6a0dd02..e5bc6dfa203 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.25.ebuild
@@ -15,13 +15,23 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 -sparc x86 
~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-3.6.25-no_acl.patch"
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+}
+
 src_configure() {
append-flags -std=gnu89 #427300
-   econf \
-   --bindir="${EPREFIX}/bin" \
-   --libdir="${EPREFIX}/$(get_libdir)" \
-   --sbindir="${EPREFIX}/sbin" \
+   local myeconfargs=(
+   --bindir="${EPREFIX}/bin"
+   --libdir="${EPREFIX}/$(get_libdir)"
+   --sbindir="${EPREFIX}/sbin"
$(use_enable static-libs static)
+   )
+   econf "${myeconfargs[@]}"
 }
 
 src_install() {

diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild 
b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
index 0704720cc94..d6725dee34e 100644
--- a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
+++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.26.ebuild
@@ -15,13 +15,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-3.6.25-no_acl.patch"
+)
+
 src_prepare() {
+   epatch "${PATCHES[@]}"
eautoreconf
 }
 
 src_configure() {
append-flags -std=gnu89 #427300
-   myeconfargs=(
+   local myeconfargs=(
--bindir="${EPREFIX}/bin"
--libdir="${EPREFIX}/$(get_libdir)"
--sbindir="${EPREFIX}/sbin"

[gentoo-commits] repo/gentoo:master commit in: sys-fs/reiserfsprogs/files/, sys-fs/reiserfsprogs/

2016-06-14 Thread Lars Wendler

commit: 04cf49f757c93614eeb31eeb3e4fc3862303a236
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jun 14 09:32:23 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jun 14 09:32:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04cf49f7

sys-fs/reiserfsprogs: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 sys-fs/reiserfsprogs/Manifest  |   2 -
 .../files/reiserfsprogs-3.6.19-fsck-n.patch|  12 -
 .../files/reiserfsprogs-3.6.19-unaligned.patch |  35 --
 .../files/reiserfsprogs-3.6.20-fsck-n.patch|  12 -
 .../files/reiserfsprogs-3.6.21-fix_large_fs.patch  | 356 -
 .../files/reiserfsprogs-3.6.21-fsck-n.patch|  14 -
 .../reiserfsprogs/reiserfsprogs-3.6.21-r1.ebuild   |  32 --
 sys-fs/reiserfsprogs/reiserfsprogs-3.6.23.ebuild   |  22 --
 8 files changed, 485 deletions(-)

diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest
index 3ba05df..6384d91 100644
--- a/sys-fs/reiserfsprogs/Manifest
+++ b/sys-fs/reiserfsprogs/Manifest
@@ -1,4 +1,2 @@
-DIST reiserfsprogs-3.6.21.tar.gz 423521 SHA256 
cc87cecd5c259665aae46a7760525486767e1ace6da833a4f1a616a58b5ad092 SHA512 
fd7e96a75aec9f8db205aaa81f5508c3bd11d550dd54a158e3c5e15ecc39cd013ff4628d622f66bc15a3597c2f763c12696fda87a350ff4dfcbc3566979edc23
 WHIRLPOOL 
b4ed0944cca82ae964412f62f1024688e8c83552c10c61f6bb27e936dde6e55fd856847ebd0450114d675c994213a5a7c96421c6506434c5c60accf86faf054e
-DIST reiserfsprogs-3.6.23.tar.xz 311524 SHA256 
022350675117a8b07d736240b16f01c8ffcc07a0bdf997a4c16818902fc6bb75 SHA512 
31039a0758148680a1f4e34b4c030f4c947732d6a0701f3df466b76509d72df5d2c8ac3e760d4ddc1edba9a229297d02ae0e4549ff9875217e75fecade76f2d6
 WHIRLPOOL 
4dd601d7aea8f5a57295c8704f0d4200c1716b32c5a4ea2de91a9406db097b54add1fe34b721d4dfce05d88329f20722547f23b73acc909416ef306ab690b7b8
 DIST reiserfsprogs-3.6.24.tar.xz 316444 SHA256 
7e44fefe557d68a642191428210f3d64d80283b9ad0e45c24130f6ce936b0760 SHA512 
183cda8c1bef375a9e90b6bfcbbbe7cc901f12890be29551e74950c723b0ae565786be86f69cba2a5d8b2f9014d22f6f3bdf277d666d4b6bea15406cb2803a42
 WHIRLPOOL 
1046b9ca94e733a1b90c220a122d41cb933522e39244b6c6de987de1eefe9a2712a3a7dbaf5de64f2c76de1eb9b43c3fe0650fc3ac11929951956a91ea92e571
 DIST reiserfsprogs-3.6.25.tar.xz 448984 SHA256 
fb1199405af8b8af609e9e97054de8f0d05b6cc2b6727713db92ed5e2919d20d SHA512 
247ca392d227680fb24e94cd490319e77e82d00d7d357516690d2cab6f0bbe8b35879f8a25ed5046bd3a7a3e1f2b140a8a82404043aa0e7f6f60f57d069857ae
 WHIRLPOOL 
d467ae27729a2777fd04578ae62327d71cf34404f9e70c717b07ef385c6d7f830546e3a07b34e9a8ca70cfd0cbdecedec2dd3720129e0c4d9131ad2d9ead3f32

diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-fsck-n.patch 
b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-fsck-n.patch
deleted file mode 100644
index 2146c94..000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-fsck-n.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur reiserfsprogs-3.6.19.orig/fsck/main.c reiserfsprogs-3.6.19/fsck/main.c
 reiserfsprogs-3.6.19.orig/fsck/main.c  2004-10-07 15:04:08.0 
+0100
-+++ reiserfsprogs-3.6.19/fsck/main.c   2007-05-02 16:05:08.0 +0100
-@@ -416,7 +416,7 @@
-   (data->log == stdout) ? "stdout" : 
-   (data->log_file_name ? data->log_file_name : "fsck.run"));
- 
--if (!(data->options & OPT_YES) && !user_confirmed (warn_to, "\nDo you 
want to "
-+if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT) && 
!user_confirmed (warn_to, "\nDo you want to "
-   "run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n"))
-   exit (EXIT_USER);
- }

diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch 
b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch
deleted file mode 100644
index 5883ce8..000
--- a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-backported from 3.6.20
-
-http://bugs.gentoo.org/153494
-
 include/reiserfs_fs.h
-+++ include/reiserfs_fs.h
-@@ -38,14 +38,22 @@
- # define extern_inline
- #endif
- 
--#include 
--
- #ifndef get_unaligned
--#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
--defined(__PPC) || defined(powerpc) || defined(__powerpc__)
--# define get_unaligned(ptr)   (*(ptr))
--# define put_unaligned(val,ptr)   ((void)(*(ptr) = (val)))
-+#define get_unaligned(ptr)  \
-+({  \
-+__typeof__(*(ptr)) __tmp;   \
-+memcpy(&__tmp, (ptr), sizeof(*(ptr)));  \
-+__tmp;  \
-+})
- #endif
-+
-+#ifndef put_unaligned
-+#define put_unaligned(val, ptr) \
-+({  \
-+__typeof__(*(ptr)) __tmp = (val);   \
-+memcpy((ptr), &__tmp, sizeof(*(ptr)));

[gentoo-commits] repo/gentoo:master commit in: sys-fs/reiserfsprogs/files/, sys-fs/reiserfsprogs/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/reiserfsprogs/files/, sys-fs/reiserfsprogs/

2 matches

Site Navigation

Mail list logo

Footer information