Author: baggins Date: Wed Sep 29 08:58:43 2010 GMT Module: packages Tag: HEAD ---- Log message: - kill aufs1, it's dead and unmaintained for almost 2 years - apply aufs2 unconditionally (with fixes wrt unionfs and grsecurity)
---- Files affected: packages/kernel: kernel.spec (1.828 -> 1.829) ---- Diffs: ================================================================ Index: packages/kernel/kernel.spec diff -u packages/kernel/kernel.spec:1.828 packages/kernel/kernel.spec:1.829 --- packages/kernel/kernel.spec:1.828 Mon Sep 27 10:50:48 2010 +++ packages/kernel/kernel.spec Wed Sep 29 10:58:38 2010 @@ -279,11 +279,6 @@ # based on mandriva kernel src.rpm patches Patch140: kernel-unionfs.patch -# aufs1, http://aufs.sourceforge.net/ -# aufs1 is NOT maintained since Jan 2009. -Patch145: kernel-aufs.patch -Patch146: kernel-aufs-support.patch - # http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git, read README # Patch creation: # git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git @@ -294,7 +289,9 @@ # cp -a Documentation fs include linux # diff -urN /usr/share/empty linux >> ~/rpm/packages/kernel/kernel-aufs2.patch -Patch148: kernel-aufs2.patch +Patch145: kernel-aufs2.patch +Patch146: kernel-aufs2-unionfs.patch +Patch147: kernel-aufs2-no-const-grsec.patch Patch150: kernel-ppc-crtsavres.patch @@ -800,19 +797,12 @@ %patch131 -p1 -# unionfs (problems with aufs2, needed for aufs1 patch) -%if %{without rescuecd} -%patch140 -p1 -%endif - -%if %{with rescuecd} # aufs2 -%patch148 -p1 -%else -# aufs1 -#patch145 -p1 -#patch146 -p1 -%endif +%patch145 -p1 +%patch146 -p1 + +# unionfs +%patch140 -p1 %patch2500 -p1 @@ -832,6 +822,8 @@ %else # grsec_full and/or pax %patch9999 -p1 +# aufs2 needs to modify those pointers +%patch147 -p1 %{?with_vserver:%patch10000 -p1} %{?with_vserver:%patch10001 -p1} %{?with_vserver:%patch10002 -p1} @@ -1597,6 +1589,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.829 2010/09/29 08:58:38 baggins +- kill aufs1, it's dead and unmaintained for almost 2 years +- apply aufs2 unconditionally (with fixes wrt unionfs and grsecurity) + Revision 1.828 2010/09/27 08:50:48 arekm - up to 2.6.35.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.828&r2=1.829&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
