diff options
| -rw-r--r-- | sys-fs/aufs2-util/ChangeLog | 3 | ||||
| -rw-r--r-- | sys-fs/aufs2-util/Manifest | 4 | ||||
| -rw-r--r-- | sys-fs/aufs2-util/aufs2-util-99999999.ebuild | 6 | ||||
| -rw-r--r-- | sys-fs/aufs2/ChangeLog | 3 | ||||
| -rw-r--r-- | sys-fs/aufs2/Manifest | 5 | ||||
| -rw-r--r-- | sys-fs/aufs2/aufs2-99999999.ebuild | 9 | ||||
| -rw-r--r-- | sys-fs/aufs2/files/grsecurity-2.2.2.patch | 61 |
7 files changed, 78 insertions, 13 deletions
diff --git a/sys-fs/aufs2-util/ChangeLog b/sys-fs/aufs2-util/ChangeLog index da6a36b2..50ed8a1c 100644 --- a/sys-fs/aufs2-util/ChangeLog +++ b/sys-fs/aufs2-util/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header $ + 20 Jun 2011; Martin Väth <martin@mvath.de> + Improve/fix git handling + 03 Jan 2011; Martin Väth <martin@mvath.de> Bump to EAPI=4. diff --git a/sys-fs/aufs2-util/Manifest b/sys-fs/aufs2-util/Manifest index 872f3e94..d7ace3d8 100644 --- a/sys-fs/aufs2-util/Manifest +++ b/sys-fs/aufs2-util/Manifest @@ -1,3 +1,3 @@ -EBUILD aufs2-util-99999999.ebuild 1320 RMD160 5057febf237bc734bcd8ff8c9bf04e0703044fe3 SHA1 7c00c2ac973444dd03044386191a76e20b241234 SHA256 fe620d0ad9c6f76c9548d2b3a367ae4b85c2ed82f90c1b796bcd09e1afe55fc9 -MISC ChangeLog 305 RMD160 c5c423d9c1cb3094b1ce6095d9c3a6ba4a98f827 SHA1 88310b4d6ea8007dc141f0819aad96fa006b2b12 SHA256 9f4f5de2a5c5a50d107b0ef8801deffa5431953df38b0d665b53c832acec30ce +EBUILD aufs2-util-99999999.ebuild 1218 RMD160 bcb3d38f84e4b1ae0a284717b9ecf539cb47c09a SHA1 54311aacf63fe9acd1a3dddbc9b1cfa438293c4f SHA256 cfcfa10cff420b0f9ee57839a8f142073176876f7788ae98ea444b5f86db4f2b +MISC ChangeLog 397 RMD160 b60993f6b9cf906d375d23f432e9ff229337941a SHA1 bd660025736d2c1e0fcab33fc2245ed9c35a2b63 SHA256 3419cb32ed08d652096fc512916037d20a5e7a22b78d291e589667cdaf6673db MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d diff --git a/sys-fs/aufs2-util/aufs2-util-99999999.ebuild b/sys-fs/aufs2-util/aufs2-util-99999999.ebuild index 5975510a..2751c422 100644 --- a/sys-fs/aufs2-util/aufs2-util-99999999.ebuild +++ b/sys-fs/aufs2-util/aufs2-util-99999999.ebuild @@ -5,10 +5,10 @@ EAPI="4" EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git" EGIT_PROJECT="aufs2-util" -# BRANCH/COMMIT will be overridden in pkg_setup (according to kernel version) EGIT_BRANCH="aufs2.1" EGIT_COMMIT="${EGIT_BRANCH}" [ -n "${EGIT_OFFLINE:-${ESCM_OFFLINE}}" ] || EGIT_PRUNE=true +EGIT_HAS_SUBMODULES=true inherit git linux-info multilib DESCRIPTION="Userspace tools for aufs2" @@ -42,7 +42,3 @@ src_prepare() { die "Patching ${i} failed" done } - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index 1213b248..df1584c0 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header $ + 20 Jun 2011; Martin Väth <martin@mvath.de> + Update patches for grsecurity. + 21 Jan 2011; Martin Väth <martin@mvath.de> Make git checkout more stable. Apply patches conditionally and more stable (retry after failure). diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest index 5f2b6abb..5ba03851 100644 --- a/sys-fs/aufs2/Manifest +++ b/sys-fs/aufs2/Manifest @@ -1,5 +1,6 @@ AUX grsecurity-2.2.0.patch 2848 RMD160 61142a27036467d48a66d4b590171c5fb72192c3 SHA1 0e3c495007b9c054990aaa4c1f1811f35cce93b3 SHA256 af56dc71ffb54a765eacdcd471b0a875be675234dbd2cdaf92ecd8eda56edc54 AUX grsecurity-2.2.1.patch 2925 RMD160 52e4ab7239584b1e9d2fd46d0e6c577c3d1033ef SHA1 bf2da73972f4b30bf5a256495470481f60c25fc2 SHA256 57aa9ec3bb8e7907f0fc3c060d7c4cee938a8f55770927138ba891a04877a321 -EBUILD aufs2-99999999.ebuild 4365 RMD160 eb4e6aca6b6f4923b319e8cebd5545764ea20d80 SHA1 ae483397134d7351315900c7691722b0a1f4f101 SHA256 f585636bbb27be7006f849048f3abe43b2b6f50d24540cde75b453975972a696 -MISC ChangeLog 1619 RMD160 5409a4a32dc7103ff16ec13c57fe9c0c7dace8ba SHA1 ca1b131698df01df830a26c9343b3a3ee4dad3a4 SHA256 18cb25f368d6d9294afde185ab3391a4b390f97883c29cf8e912a0f511549424 +AUX grsecurity-2.2.2.patch 2900 RMD160 e1db89f795c55c8a672e05381df8ce4ca0e3c331 SHA1 61facafac814f5b4f64a7a4011ec56207a8340ca SHA256 d4d7b8e1db85f57f77218d705a1f2e9de77da1e3c5b991da2704a1a405a40cf8 +EBUILD aufs2-99999999.ebuild 4366 RMD160 fbe344d510d6d1cde6d6c2a5224d831be90bb031 SHA1 d5afeafe856f95f9ebaf19fed4e4217dd8595bed SHA256 efecbbeb03eab440f4b5e79c46d4a045072915edaddf9122eda8de9cf6a4fd41 +MISC ChangeLog 1717 RMD160 4f0539827ea5e677138b8d7b1f7a62466e5c56c0 SHA1 dc3c6b4bd8b2d10fe54ba73b0050ddd8f897038f SHA256 00f6a4ca1b1b14eb3360953d5ba9afa65c2058311059d53907f2e7ccce3e386f MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d diff --git a/sys-fs/aufs2/aufs2-99999999.ebuild b/sys-fs/aufs2/aufs2-99999999.ebuild index f2f8c565..902599d7 100644 --- a/sys-fs/aufs2/aufs2-99999999.ebuild +++ b/sys-fs/aufs2/aufs2-99999999.ebuild @@ -12,7 +12,7 @@ EGIT_COMMIT="${EGIT_BRANCH}" EGIT_HAS_SUBMODULES=true inherit git linux-info eutils -DESCRIPTION="An entirely re-designed and re-implemented Unionfs." +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" HOMEPAGE="http://aufs.sourceforge.net/" LICENSE="GPL-2" @@ -118,9 +118,10 @@ pkg_setup() { } src_prepare() { - local i - for i in grsecurity-2.2.0.patch grsecurity-2.2.1.patch - do cp -p -- "${FILESDIR}/${i}" "aufs2-${i}" || die "copying ${i} failed" + local i j + for i in 2.2.0 2.2.1 2.2.2 + do j="grsecurity-${i}.patch" + cp -p -- "${FILESDIR}/${j}" "aufs2-${j}" || die "copying ${j} failed" done } diff --git a/sys-fs/aufs2/files/grsecurity-2.2.2.patch b/sys-fs/aufs2/files/grsecurity-2.2.2.patch new file mode 100644 index 00000000..9a38594d --- /dev/null +++ b/sys-fs/aufs2/files/grsecurity-2.2.2.patch @@ -0,0 +1,61 @@ +--- linux/include/linux/fs.h ++++ linux/include/linux/fs.h +@@ -580,41 +580,41 @@ + unsigned long, unsigned long); + + struct address_space_operations { +- int (* const writepage)(struct page *page, struct writeback_control *wbc); +- int (* const readpage)(struct file *, struct page *); ++ int (*writepage)(struct page *page, struct writeback_control *wbc); ++ int (*readpage)(struct file *, struct page *); + + /* Write back some dirty pages from this mapping. */ +- int (* const writepages)(struct address_space *, struct writeback_control *); ++ int (*writepages)(struct address_space *, struct writeback_control *); + + /* Set a page dirty. Return true if this dirtied it */ +- int (* const set_page_dirty)(struct page *page); ++ int (*set_page_dirty)(struct page *page); + +- int (* const readpages)(struct file *filp, struct address_space *mapping, ++ int (*readpages)(struct file *filp, struct address_space *mapping, + struct list_head *pages, unsigned nr_pages); + +- int (* const write_begin)(struct file *, struct address_space *mapping, ++ int (*write_begin)(struct file *, struct address_space *mapping, + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata); +- int (* const write_end)(struct file *, struct address_space *mapping, ++ int (*write_end)(struct file *, struct address_space *mapping, + loff_t pos, unsigned len, unsigned copied, + struct page *page, void *fsdata); + + /* Unfortunately this kludge is needed for FIBMAP. Don't use it */ +- sector_t (* const bmap)(struct address_space *, sector_t); +- void (* const invalidatepage) (struct page *, unsigned long); +- int (* const releasepage) (struct page *, gfp_t); +- void (* const freepage)(struct page *); +- ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov, ++ sector_t (*bmap)(struct address_space *, sector_t); ++ void (*invalidatepage) (struct page *, unsigned long); ++ int (*releasepage) (struct page *, gfp_t); ++ void (*freepage)(struct page *); ++ ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov, + loff_t offset, unsigned long nr_segs); +- int (* const get_xip_mem)(struct address_space *, pgoff_t, int, ++ int (*get_xip_mem)(struct address_space *, pgoff_t, int, + void **, unsigned long *); + /* migrate the contents of a page to the specified target */ +- int (* const migratepage) (struct address_space *, ++ int (*migratepage) (struct address_space *, + struct page *, struct page *); +- int (* const launder_page) (struct page *); +- int (* const is_partially_uptodate) (struct page *, read_descriptor_t *, ++ int (*launder_page) (struct page *); ++ int (*is_partially_uptodate) (struct page *, read_descriptor_t *, + unsigned long); +- int (* const error_remove_page)(struct address_space *, struct page *); ++ int (*error_remove_page)(struct address_space *, struct page *); + }; + + extern const struct address_space_operations empty_aops; |