(メッセージはありません)
@@ -23,10 +23,10 @@ | ||
23 | 23 | # Download TOMOYO Linux patches. |
24 | 24 | mkdir -p /root/rpmbuild/SOURCES/ |
25 | 25 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
26 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
26 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
27 | 27 | then |
28 | 28 | apt-get -y install wget |
29 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
29 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
30 | 30 | fi |
31 | 31 | |
32 | 32 | # Install kernel source packages. |
@@ -38,7 +38,7 @@ | ||
38 | 38 | |
39 | 39 | # Apply patches and create kernel config. |
40 | 40 | cd linux-source-3.2 || die "Can't chdir to linux-source-3.2/ ." |
41 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
41 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
42 | 42 | patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff || die "Can't apply patch." |
43 | 43 | cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.ccs > .config || die "Can't create config." |
44 | 44 | sed -i -e 's/SUBLEVEL = .*/SUBLEVEL = 0/' Makefile || die "Can't edit Makefile" |
@@ -20,9 +20,9 @@ | ||
20 | 20 | rpm -ivh kernel-3.19.8-100.fc20.src.rpm || die "Can't install source package." |
21 | 21 | |
22 | 22 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
23 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
23 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
24 | 24 | then |
25 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
25 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
26 | 26 | fi |
27 | 27 | |
28 | 28 | cd /root/rpmbuild/SPECS/ || die "Can't chdir to /root/rpmbuild/SPECS/ ." |
@@ -71,7 +71,7 @@ | ||
71 | 71 | # END OF PATCH APPLICATIONS |
72 | 72 | |
73 | 73 | +# TOMOYO Linux |
74 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
74 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
75 | 75 | +patch -sp1 < patches/ccs-patch-3.19-fedora-20.diff |
76 | 76 | + |
77 | 77 | %endif |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.9-103.EL.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -61,7 +61,7 @@ | ||
61 | 61 | # END OF PATCH APPLICATIONS |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-2.6.9-centos-4.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -20,9 +20,9 @@ | ||
20 | 20 | rpm -ivh kernel-3.14.27-100.fc19.src.rpm || die "Can't install source package." |
21 | 21 | |
22 | 22 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
23 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
23 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
24 | 24 | then |
25 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
25 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
26 | 26 | fi |
27 | 27 | |
28 | 28 | cd /root/rpmbuild/SPECS/ || die "Can't chdir to /root/rpmbuild/SPECS/ ." |
@@ -71,7 +71,7 @@ | ||
71 | 71 | # END OF PATCH APPLICATIONS |
72 | 72 | |
73 | 73 | +# TOMOYO Linux |
74 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
74 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
75 | 75 | +patch -sp1 < patches/ccs-patch-3.14-fedora-19.diff |
76 | 76 | + |
77 | 77 | %endif |
@@ -38,9 +38,9 @@ | ||
38 | 38 | # Download TOMOYO Linux patches. |
39 | 39 | mkdir -p /root/rpmbuild/SOURCES/ |
40 | 40 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
41 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
41 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
42 | 42 | then |
43 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
43 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
44 | 44 | fi |
45 | 45 | |
46 | 46 | # Install kernel source packages. |
@@ -52,7 +52,7 @@ | ||
52 | 52 | |
53 | 53 | # Apply patches and create kernel config. |
54 | 54 | cd linux-source-2.6.32 || die "Can't chdir to linux-source-2.6.32/ ." |
55 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
55 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
56 | 56 | patch -p1 < patches/ccs-patch-2.6.32-debian-squeeze.diff || die "Can't apply patch." |
57 | 57 | cat /boot/config-2.6.32-5-686 config.ccs > .config || die "Can't create config." |
58 | 58 |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.18-398.1.AXS3.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/asianux/SOURCES/ || die "Can't chdir to /usr/src/asianux/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -61,7 +61,7 @@ | ||
61 | 61 | # end of Asianux patches |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-2.6.18-asianux-3.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.4.21-63.EL.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -51,7 +51,7 @@ | ||
51 | 51 | # END OF PATCH APPLICATIONS |
52 | 52 | |
53 | 53 | +# TOMOYO Linux |
54 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
54 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
55 | 55 | +patch -sp1 < patches/ccs-patch-2.4.21-centos-3.diff |
56 | 56 | + |
57 | 57 | cp %{SOURCE10} Documentation/ |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-3.10.0-327.28.2.el7.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ." |
@@ -69,7 +69,7 @@ | ||
69 | 69 | ApplyOptionalPatch debrand-rh-i686-cpu.patch |
70 | 70 | |
71 | 71 | +# TOMOYO Linux |
72 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
72 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
73 | 73 | +patch -sp1 < patches/ccs-patch-3.10-centos-7.diff |
74 | 74 | + |
75 | 75 | # Any further pre-build tree manipulations happen here. |
@@ -75,9 +75,9 @@ | ||
75 | 75 | rpm -ivh kernel-default-3.7.10-1.45.1.nosrc.rpm || die "Can't install source package." |
76 | 76 | |
77 | 77 | cd /usr/src/packages/SOURCES/ || die "Can't chdir to /usr/src/packages/SOURCES/ ." |
78 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
78 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
79 | 79 | then |
80 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
80 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
81 | 81 | fi |
82 | 82 | |
83 | 83 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -105,7 +105,7 @@ | ||
105 | 105 | %_sourcedir/series.conf .. $SYMBOLS |
106 | 106 | |
107 | 107 | +# TOMOYO Linux |
108 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
108 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
109 | 109 | +patch -sp1 < patches/ccs-patch-3.7-suse-12.3.diff |
110 | 110 | +cat config.ccs >> ../config/%cpu_arch_flavor |
111 | 111 | + |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.32-642.3.1.el6.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /root/rpmbuild/SPECS/ || die "Can't chdir to /root/rpmbuild/SPECS/ ." |
@@ -69,7 +69,7 @@ | ||
69 | 69 | ApplyOptionalPatch linux-kernel-test.patch |
70 | 70 | |
71 | 71 | +# TOMOYO Linux |
72 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
72 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
73 | 73 | +patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff |
74 | 74 | + |
75 | 75 | # Any further pre-build tree manipulations happen here. |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-2.6.18-411.el5.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -61,7 +61,7 @@ | ||
61 | 61 | %endif |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-2.6.18-centos-5.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p /root/rpmbuild/SOURCES/ |
31 | 31 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.5.0/ || die "Can't chdir to linux-3.5.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.5-ubuntu-12.10.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p /root/rpmbuild/SOURCES/ |
31 | 31 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-2.6.32/ || die "Can't chdir to linux-2.6.32/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-2.6.32-ubuntu-10.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p /root/rpmbuild/SOURCES/ |
31 | 31 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.11.0/ || die "Can't chdir to linux-3.11.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.11-ubuntu-13.10.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p /root/rpmbuild/SOURCES/ |
31 | 31 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.2.0/ || die "Can't chdir to linux-3.2.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p /root/rpmbuild/SOURCES/ |
31 | 31 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.8.0/ || die "Can't chdir to linux-3.8.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.8-ubuntu-13.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -29,9 +29,9 @@ | ||
29 | 29 | # Download TOMOYO Linux patches. |
30 | 30 | mkdir -p /root/rpmbuild/SOURCES/ |
31 | 31 | cd /root/rpmbuild/SOURCES/ || die "Can't chdir to /root/rpmbuild/SOURCES/ ." |
32 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
32 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
33 | 33 | then |
34 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
34 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
35 | 35 | fi |
36 | 36 | |
37 | 37 | # Install kernel source packages. |
@@ -44,7 +44,7 @@ | ||
44 | 44 | # Apply patches and create kernel config. |
45 | 45 | cd linux-3.13.0/ || die "Can't chdir to linux-3.13.0/ ." |
46 | 46 | update_maintainer |
47 | -tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160727.tar.gz || die "Can't extract patch." | |
47 | +tar -zxf /root/rpmbuild/SOURCES/ccs-patch-1.8.5-20160808.tar.gz || die "Can't extract patch." | |
48 | 48 | patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff || die "Can't apply patch." |
49 | 49 | rm -fR patches/ specs/ || die "Can't delete patch." |
50 | 50 | for i in `find debian.master/ -type f -name '*'${ORIGINAL_FLAVOUR}'*'`; do cp -p $i `echo $i | sed -e 's/'${ORIGINAL_FLAVOUR}'/'${NEW_FLAVOUR}'/g'`; done |
@@ -18,9 +18,9 @@ | ||
18 | 18 | rpm -ivh kernel-3.4.110-4vl6.src.rpm || die "Can't install source package." |
19 | 19 | |
20 | 20 | cd /root/rpm/SOURCES/ || die "Can't chdir to /root/rpm/SOURCES/ ." |
21 | -if [ ! -r ccs-patch-1.8.5-20160727.tar.gz ] | |
21 | +if [ ! -r ccs-patch-1.8.5-20160808.tar.gz ] | |
22 | 22 | then |
23 | - wget -O ccs-patch-1.8.5-20160727.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160727.tar.gz' || die "Can't download patch." | |
23 | + wget -O ccs-patch-1.8.5-20160808.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20160808.tar.gz' || die "Can't download patch." | |
24 | 24 | fi |
25 | 25 | |
26 | 26 | cd /tmp/ || die "Can't chdir to /tmp/ ." |
@@ -61,7 +61,7 @@ | ||
61 | 61 | # END OF PATCH APPLICATIONS |
62 | 62 | |
63 | 63 | +# TOMOYO Linux |
64 | -+tar -zxf %_sourcedir/ccs-patch-1.8.5-20160727.tar.gz | |
64 | ++tar -zxf %_sourcedir/ccs-patch-1.8.5-20160808.tar.gz | |
65 | 65 | +patch -sp1 < patches/ccs-patch-3.4-vine-linux-6.diff |
66 | 66 | + |
67 | 67 | cp %{SOURCE10} Documentation/ |
@@ -1,6 +1,6 @@ | ||
1 | -This is TOMOYO Linux patch for linux-next. | |
1 | +This is TOMOYO Linux patch for kernel 4.8-rc1. | |
2 | 2 | |
3 | -Source code for this patch is https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/snapshot/linux-next-next-20160724.tar.xz | |
3 | +Source code for this patch is https://www.kernel.org/pub/linux/kernel/v4.x/testing/linux-4.8-rc1.tar.xz | |
4 | 4 | --- |
5 | 5 | fs/exec.c | 2 - |
6 | 6 | fs/open.c | 2 + |
@@ -28,9 +28,9 @@ | ||
28 | 28 | security/Makefile | 3 ++ |
29 | 29 | 24 files changed, 147 insertions(+), 26 deletions(-) |
30 | 30 | |
31 | ---- linux-next.orig/fs/exec.c | |
32 | -+++ linux-next/fs/exec.c | |
33 | -@@ -1583,7 +1583,7 @@ static int exec_binprm(struct linux_binp | |
31 | +--- linux-4.8-rc1.orig/fs/exec.c | |
32 | ++++ linux-4.8-rc1/fs/exec.c | |
33 | +@@ -1616,7 +1616,7 @@ static int exec_binprm(struct linux_binp | |
34 | 34 | old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent)); |
35 | 35 | rcu_read_unlock(); |
36 | 36 |
@@ -39,9 +39,9 @@ | ||
39 | 39 | if (ret >= 0) { |
40 | 40 | audit_bprm(bprm); |
41 | 41 | trace_sched_process_exec(current, old_pid, bprm); |
42 | ---- linux-next.orig/fs/open.c | |
43 | -+++ linux-next/fs/open.c | |
44 | -@@ -1139,6 +1139,8 @@ EXPORT_SYMBOL(sys_close); | |
42 | +--- linux-4.8-rc1.orig/fs/open.c | |
43 | ++++ linux-4.8-rc1/fs/open.c | |
44 | +@@ -1128,6 +1128,8 @@ EXPORT_SYMBOL(sys_close); | |
45 | 45 | */ |
46 | 46 | SYSCALL_DEFINE0(vhangup) |
47 | 47 | { |
@@ -50,8 +50,8 @@ | ||
50 | 50 | if (capable(CAP_SYS_TTY_CONFIG)) { |
51 | 51 | tty_vhangup_self(); |
52 | 52 | return 0; |
53 | ---- linux-next.orig/fs/proc/version.c | |
54 | -+++ linux-next/fs/proc/version.c | |
53 | +--- linux-4.8-rc1.orig/fs/proc/version.c | |
54 | ++++ linux-4.8-rc1/fs/proc/version.c | |
55 | 55 | @@ -32,3 +32,10 @@ static int __init proc_version_init(void |
56 | 56 | return 0; |
57 | 57 | } |
@@ -59,12 +59,12 @@ | ||
59 | 59 | + |
60 | 60 | +static int __init ccs_show_version(void) |
61 | 61 | +{ |
62 | -+ printk(KERN_INFO "Hook version: 4.7-rc7-next-20160724 2016/07/25\n"); | |
62 | ++ printk(KERN_INFO "Hook version: 4.8-rc1 2016/08/08\n"); | |
63 | 63 | + return 0; |
64 | 64 | +} |
65 | 65 | +fs_initcall(ccs_show_version); |
66 | ---- linux-next.orig/include/linux/init_task.h | |
67 | -+++ linux-next/include/linux/init_task.h | |
66 | +--- linux-4.8-rc1.orig/include/linux/init_task.h | |
67 | ++++ linux-4.8-rc1/include/linux/init_task.h | |
68 | 68 | @@ -183,6 +183,14 @@ extern struct task_group root_task_group |
69 | 69 | # define INIT_KASAN(tsk) |
70 | 70 | #endif |
@@ -88,8 +88,8 @@ | ||
88 | 88 | } |
89 | 89 | |
90 | 90 | |
91 | ---- linux-next.orig/include/linux/sched.h | |
92 | -+++ linux-next/include/linux/sched.h | |
91 | +--- linux-4.8-rc1.orig/include/linux/sched.h | |
92 | ++++ linux-4.8-rc1/include/linux/sched.h | |
93 | 93 | @@ -6,6 +6,8 @@ |
94 | 94 | #include <linux/sched/prio.h> |
95 | 95 |
@@ -110,8 +110,8 @@ | ||
110 | 110 | /* CPU-specific state of this task */ |
111 | 111 | struct thread_struct thread; |
112 | 112 | /* |
113 | ---- linux-next.orig/include/linux/security.h | |
114 | -+++ linux-next/include/linux/security.h | |
113 | +--- linux-4.8-rc1.orig/include/linux/security.h | |
114 | ++++ linux-4.8-rc1/include/linux/security.h | |
115 | 115 | @@ -55,6 +55,7 @@ struct msg_queue; |
116 | 116 | struct xattr; |
117 | 117 | struct xfrm_sec_ctx; |
@@ -318,8 +318,8 @@ | ||
318 | 318 | } |
319 | 319 | #endif /* CONFIG_SECURITY_PATH */ |
320 | 320 | |
321 | ---- linux-next.orig/include/net/ip.h | |
322 | -+++ linux-next/include/net/ip.h | |
321 | +--- linux-4.8-rc1.orig/include/net/ip.h | |
322 | ++++ linux-4.8-rc1/include/net/ip.h | |
323 | 323 | @@ -224,6 +224,8 @@ void inet_get_local_port_range(struct ne |
324 | 324 | #ifdef CONFIG_SYSCTL |
325 | 325 | static inline int inet_is_local_reserved_port(struct net *net, int port) |
@@ -338,8 +338,8 @@ | ||
338 | 338 | return 0; |
339 | 339 | } |
340 | 340 | #endif |
341 | ---- linux-next.orig/kernel/fork.c | |
342 | -+++ linux-next/kernel/fork.c | |
341 | +--- linux-4.8-rc1.orig/kernel/fork.c | |
342 | ++++ linux-4.8-rc1/kernel/fork.c | |
343 | 343 | @@ -265,6 +265,7 @@ void __put_task_struct(struct task_struc |
344 | 344 | delayacct_tsk_free(tsk); |
345 | 345 | put_signal_struct(tsk->signal); |
@@ -348,7 +348,7 @@ | ||
348 | 348 | if (!profile_handoff_task(tsk)) |
349 | 349 | free_task(tsk); |
350 | 350 | } |
351 | -@@ -1466,6 +1467,9 @@ static __latent_entropy struct task_stru | |
351 | +@@ -1464,6 +1465,9 @@ static struct task_struct *copy_process( | |
352 | 352 | goto bad_fork_cleanup_perf; |
353 | 353 | /* copy all the process information */ |
354 | 354 | shm_init_task(p); |
@@ -358,7 +358,7 @@ | ||
358 | 358 | retval = copy_semundo(clone_flags, p); |
359 | 359 | if (retval) |
360 | 360 | goto bad_fork_cleanup_audit; |
361 | -@@ -1683,6 +1687,7 @@ bad_fork_cleanup_semundo: | |
361 | +@@ -1681,6 +1685,7 @@ bad_fork_cleanup_semundo: | |
362 | 362 | exit_sem(p); |
363 | 363 | bad_fork_cleanup_audit: |
364 | 364 | audit_free(p); |
@@ -366,8 +366,8 @@ | ||
366 | 366 | bad_fork_cleanup_perf: |
367 | 367 | perf_event_free_task(p); |
368 | 368 | bad_fork_cleanup_policy: |
369 | ---- linux-next.orig/kernel/kexec.c | |
370 | -+++ linux-next/kernel/kexec.c | |
369 | +--- linux-4.8-rc1.orig/kernel/kexec.c | |
370 | ++++ linux-4.8-rc1/kernel/kexec.c | |
371 | 371 | @@ -17,7 +17,7 @@ |
372 | 372 | #include <linux/syscalls.h> |
373 | 373 | #include <linux/vmalloc.h> |
@@ -386,8 +386,8 @@ | ||
386 | 386 | |
387 | 387 | /* |
388 | 388 | * Verify we have a legal set of flags |
389 | ---- linux-next.orig/kernel/module.c | |
390 | -+++ linux-next/kernel/module.c | |
389 | +--- linux-4.8-rc1.orig/kernel/module.c | |
390 | ++++ linux-4.8-rc1/kernel/module.c | |
391 | 391 | @@ -63,6 +63,7 @@ |
392 | 392 | #include <linux/dynamic_debug.h> |
393 | 393 | #include <uapi/linux/module.h> |
@@ -405,7 +405,7 @@ | ||
405 | 405 | |
406 | 406 | if (strncpy_from_user(name, name_user, MODULE_NAME_LEN-1) < 0) |
407 | 407 | return -EFAULT; |
408 | -@@ -3397,6 +3400,8 @@ static int may_init_module(void) | |
408 | +@@ -3464,6 +3467,8 @@ static int may_init_module(void) | |
409 | 409 | { |
410 | 410 | if (!capable(CAP_SYS_MODULE) || modules_disabled) |
411 | 411 | return -EPERM; |
@@ -414,8 +414,8 @@ | ||
414 | 414 | |
415 | 415 | return 0; |
416 | 416 | } |
417 | ---- linux-next.orig/kernel/ptrace.c | |
418 | -+++ linux-next/kernel/ptrace.c | |
417 | +--- linux-4.8-rc1.orig/kernel/ptrace.c | |
418 | ++++ linux-4.8-rc1/kernel/ptrace.c | |
419 | 419 | @@ -1080,6 +1080,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l |
420 | 420 | { |
421 | 421 | struct task_struct *child; |
@@ -440,8 +440,8 @@ | ||
440 | 440 | |
441 | 441 | if (request == PTRACE_TRACEME) { |
442 | 442 | ret = ptrace_traceme(); |
443 | ---- linux-next.orig/kernel/reboot.c | |
444 | -+++ linux-next/kernel/reboot.c | |
443 | +--- linux-4.8-rc1.orig/kernel/reboot.c | |
444 | ++++ linux-4.8-rc1/kernel/reboot.c | |
445 | 445 | @@ -16,6 +16,7 @@ |
446 | 446 | #include <linux/syscalls.h> |
447 | 447 | #include <linux/syscore_ops.h> |
@@ -459,9 +459,9 @@ | ||
459 | 459 | |
460 | 460 | /* |
461 | 461 | * If pid namespaces are enabled and the current task is in a child |
462 | ---- linux-next.orig/kernel/sched/core.c | |
463 | -+++ linux-next/kernel/sched/core.c | |
464 | -@@ -3741,6 +3741,8 @@ int can_nice(const struct task_struct *p | |
462 | +--- linux-4.8-rc1.orig/kernel/sched/core.c | |
463 | ++++ linux-4.8-rc1/kernel/sched/core.c | |
464 | +@@ -3734,6 +3734,8 @@ int can_nice(const struct task_struct *p | |
465 | 465 | SYSCALL_DEFINE1(nice, int, increment) |
466 | 466 | { |
467 | 467 | long nice, retval; |
@@ -470,8 +470,8 @@ | ||
470 | 470 | |
471 | 471 | /* |
472 | 472 | * Setpriority might change our priority at the same moment. |
473 | ---- linux-next.orig/kernel/signal.c | |
474 | -+++ linux-next/kernel/signal.c | |
473 | +--- linux-4.8-rc1.orig/kernel/signal.c | |
474 | ++++ linux-4.8-rc1/kernel/signal.c | |
475 | 475 | @@ -2847,6 +2847,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s |
476 | 476 | SYSCALL_DEFINE2(kill, pid_t, pid, int, sig) |
477 | 477 | { |
@@ -517,8 +517,8 @@ | ||
517 | 517 | |
518 | 518 | return do_send_specific(tgid, pid, sig, info); |
519 | 519 | } |
520 | ---- linux-next.orig/kernel/sys.c | |
521 | -+++ linux-next/kernel/sys.c | |
520 | +--- linux-4.8-rc1.orig/kernel/sys.c | |
521 | ++++ linux-4.8-rc1/kernel/sys.c | |
522 | 522 | @@ -183,6 +183,10 @@ SYSCALL_DEFINE3(setpriority, int, which, |
523 | 523 | |
524 | 524 | if (which > PRIO_USER || which < PRIO_PROCESS) |
@@ -548,8 +548,8 @@ | ||
548 | 548 | |
549 | 549 | down_write(&uts_sem); |
550 | 550 | errno = -EFAULT; |
551 | ---- linux-next.orig/kernel/time/ntp.c | |
552 | -+++ linux-next/kernel/time/ntp.c | |
551 | +--- linux-4.8-rc1.orig/kernel/time/ntp.c | |
552 | ++++ linux-4.8-rc1/kernel/time/ntp.c | |
553 | 553 | @@ -17,6 +17,7 @@ |
554 | 554 | #include <linux/module.h> |
555 | 555 | #include <linux/rtc.h> |
@@ -583,8 +583,8 @@ | ||
583 | 583 | |
584 | 584 | if (txc->modes & ADJ_NANO) { |
585 | 585 | struct timespec ts; |
586 | ---- linux-next.orig/net/ipv4/raw.c | |
587 | -+++ linux-next/net/ipv4/raw.c | |
586 | +--- linux-4.8-rc1.orig/net/ipv4/raw.c | |
587 | ++++ linux-4.8-rc1/net/ipv4/raw.c | |
588 | 588 | @@ -742,6 +742,10 @@ static int raw_recvmsg(struct sock *sk, |
589 | 589 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
590 | 590 | if (!skb) |
@@ -596,8 +596,8 @@ | ||
596 | 596 | |
597 | 597 | copied = skb->len; |
598 | 598 | if (len < copied) { |
599 | ---- linux-next.orig/net/ipv4/udp.c | |
600 | -+++ linux-next/net/ipv4/udp.c | |
599 | +--- linux-4.8-rc1.orig/net/ipv4/udp.c | |
600 | ++++ linux-4.8-rc1/net/ipv4/udp.c | |
601 | 601 | @@ -1272,6 +1272,8 @@ try_again: |
602 | 602 | &peeked, &off, &err); |
603 | 603 | if (!skb) |
@@ -607,8 +607,8 @@ | ||
607 | 607 | |
608 | 608 | ulen = skb->len; |
609 | 609 | copied = len; |
610 | ---- linux-next.orig/net/ipv6/raw.c | |
611 | -+++ linux-next/net/ipv6/raw.c | |
610 | +--- linux-4.8-rc1.orig/net/ipv6/raw.c | |
611 | ++++ linux-4.8-rc1/net/ipv6/raw.c | |
612 | 612 | @@ -478,6 +478,10 @@ static int rawv6_recvmsg(struct sock *sk |
613 | 613 | skb = skb_recv_datagram(sk, flags, noblock, &err); |
614 | 614 | if (!skb) |
@@ -620,8 +620,8 @@ | ||
620 | 620 | |
621 | 621 | copied = skb->len; |
622 | 622 | if (copied > len) { |
623 | ---- linux-next.orig/net/ipv6/udp.c | |
624 | -+++ linux-next/net/ipv6/udp.c | |
623 | +--- linux-4.8-rc1.orig/net/ipv6/udp.c | |
624 | ++++ linux-4.8-rc1/net/ipv6/udp.c | |
625 | 625 | @@ -348,6 +348,8 @@ try_again: |
626 | 626 | &peeked, &off, &err); |
627 | 627 | if (!skb) |
@@ -631,8 +631,8 @@ | ||
631 | 631 | |
632 | 632 | ulen = skb->len; |
633 | 633 | copied = len; |
634 | ---- linux-next.orig/net/socket.c | |
635 | -+++ linux-next/net/socket.c | |
634 | +--- linux-4.8-rc1.orig/net/socket.c | |
635 | ++++ linux-4.8-rc1/net/socket.c | |
636 | 636 | @@ -1469,6 +1469,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct |
637 | 637 | if (err < 0) |
638 | 638 | goto out_fd; |
@@ -644,8 +644,8 @@ | ||
644 | 644 | if (upeer_sockaddr) { |
645 | 645 | if (newsock->ops->getname(newsock, (struct sockaddr *)&address, |
646 | 646 | &len, 2) < 0) { |
647 | ---- linux-next.orig/net/unix/af_unix.c | |
648 | -+++ linux-next/net/unix/af_unix.c | |
647 | +--- linux-4.8-rc1.orig/net/unix/af_unix.c | |
648 | ++++ linux-4.8-rc1/net/unix/af_unix.c | |
649 | 649 | @@ -2153,6 +2153,10 @@ static int unix_dgram_recvmsg(struct soc |
650 | 650 | POLLOUT | POLLWRNORM | |
651 | 651 | POLLWRBAND); |
@@ -665,9 +665,9 @@ | ||
665 | 665 | mutex_unlock(&u->readlock); |
666 | 666 | out: |
667 | 667 | return err; |
668 | ---- linux-next.orig/security/Kconfig | |
669 | -+++ linux-next/security/Kconfig | |
670 | -@@ -192,5 +192,7 @@ config DEFAULT_SECURITY | |
668 | +--- linux-4.8-rc1.orig/security/Kconfig | |
669 | ++++ linux-4.8-rc1/security/Kconfig | |
670 | +@@ -164,5 +164,7 @@ config DEFAULT_SECURITY | |
671 | 671 | default "apparmor" if DEFAULT_SECURITY_APPARMOR |
672 | 672 | default "" if DEFAULT_SECURITY_DAC |
673 | 673 |
@@ -675,8 +675,8 @@ | ||
675 | 675 | + |
676 | 676 | endmenu |
677 | 677 | |
678 | ---- linux-next.orig/security/Makefile | |
679 | -+++ linux-next/security/Makefile | |
678 | +--- linux-4.8-rc1.orig/security/Makefile | |
679 | ++++ linux-4.8-rc1/security/Makefile | |
680 | 680 | @@ -29,3 +29,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c |
681 | 681 | # Object integrity file lists |
682 | 682 | subdir-$(CONFIG_INTEGRITY) += integrity |