• R/O
  • SSH
  • HTTPS

tomoyo: Commit


Commit MetaInfo

Revision6649 (tree)
Time2018-05-22 22:11:03
Authorkumaneko

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-c6-2.6.32.sh (revision 6649)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.32-696.28.1.el6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
21+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -69,7 +69,7 @@
6969 ApplyOptionalPatch linux-kernel-test.patch
7070
7171 +# TOMOYO Linux
72-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
72++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
7373 +patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff
7474 +
7575 # Any further pre-build tree manipulations happen here.
--- trunk/1.8.x/ccs-patch/specs/build-c5-2.6.18.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-c5-2.6.18.sh (revision 6649)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.18-419.el5.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
21+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -61,7 +61,7 @@
6161 %endif
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
6565 +patch -sp1 < patches/ccs-patch-2.6.18-centos-5.diff
6666 +
6767 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.10.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.10.sh (revision 6649)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
32+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.5.0/ || die "Can't chdir to linux-3.5.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.5-ubuntu-12.10.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 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
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_10.04.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_10.04.sh (revision 6649)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
32+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-2.6.32/ || die "Can't chdir to linux-2.6.32/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-2.6.32-ubuntu-10.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 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
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.10.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.10.sh (revision 6649)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
32+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.11.0/ || die "Can't chdir to linux-3.11.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.11-ubuntu-13.10.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 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
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.04.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_12.04.sh (revision 6649)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
32+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.2.0/ || die "Can't chdir to linux-3.2.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 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
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.04.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_13.04.sh (revision 6649)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
32+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.8.0/ || die "Can't chdir to linux-3.8.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.8-ubuntu-13.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 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
--- trunk/1.8.x/ccs-patch/specs/build-ubuntu_14.04.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-ubuntu_14.04.sh (revision 6649)
@@ -29,9 +29,9 @@
2929 # Download TOMOYO Linux patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
32+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
3333 then
34- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
34+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
3535 fi
3636
3737 # Install kernel source packages.
@@ -44,7 +44,7 @@
4444 # Apply patches and create kernel config.
4545 cd linux-3.13.0/ || die "Can't chdir to linux-3.13.0/ ."
4646 update_maintainer
47-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
4848 patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff || die "Can't apply patch."
4949 rm -fR patches/ specs/ || die "Can't delete patch."
5050 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
--- trunk/1.8.x/ccs-patch/specs/build-vl6-4.4.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-vl6-4.4.sh (revision 6649)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-4.4.110-2vl6.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpm/SOURCES/ || die "Can't chdir to ~/rpm/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
21+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -61,7 +61,7 @@
6161 # END OF PATCH APPLICATIONS
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
6565 +patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff
6666 +
6767 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-debian_wheezy.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-debian_wheezy.sh (revision 6649)
@@ -23,10 +23,10 @@
2323 # Download TOMOYO Linux patches.
2424 mkdir -p ~/rpmbuild/SOURCES/
2525 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
26-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
26+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2727 then
2828 apt-get -y install wget
29- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
29+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
3030 fi
3131
3232 # Install kernel source packages.
@@ -38,7 +38,7 @@
3838
3939 # Apply patches and create kernel config.
4040 cd linux-source-3.2 || die "Can't chdir to linux-source-3.2/ ."
41-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
41+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
4242 patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff || die "Can't apply patch."
4343 cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.ccs > .config || die "Can't create config."
4444 sed -i -e 's/SUBLEVEL = .*/SUBLEVEL = 0/' Makefile || die "Can't edit Makefile"
--- trunk/1.8.x/ccs-patch/specs/build-f20-3.19.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-f20-3.19.sh (revision 6649)
@@ -20,9 +20,9 @@
2020 rpm -ivh kernel-3.19.8-100.fc20.src.rpm || die "Can't install source package."
2121
2222 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
23-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
23+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2424 then
25- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
25+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2626 fi
2727
2828 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -71,7 +71,7 @@
7171 # END OF PATCH APPLICATIONS
7272
7373 +# TOMOYO Linux
74-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
74++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
7575 +patch -sp1 < patches/ccs-patch-3.19-fedora-20.diff
7676 +
7777 %endif
--- trunk/1.8.x/ccs-patch/specs/build-c4-2.6.9.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-c4-2.6.9.sh (revision 6649)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.9-103.EL.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
21+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -61,7 +61,7 @@
6161 # END OF PATCH APPLICATIONS
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
6565 +patch -sp1 < patches/ccs-patch-2.6.9-centos-4.diff
6666 +
6767 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-f19-3.14.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-f19-3.14.sh (revision 6649)
@@ -20,9 +20,9 @@
2020 rpm -ivh kernel-3.14.27-100.fc19.src.rpm || die "Can't install source package."
2121
2222 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
23-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
23+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2424 then
25- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
25+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2626 fi
2727
2828 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -71,7 +71,7 @@
7171 # END OF PATCH APPLICATIONS
7272
7373 +# TOMOYO Linux
74-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
74++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
7575 +patch -sp1 < patches/ccs-patch-3.14-fedora-19.diff
7676 +
7777 %endif
--- trunk/1.8.x/ccs-patch/specs/build-debian_squeeze.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-debian_squeeze.sh (revision 6649)
@@ -38,9 +38,9 @@
3838 # Download TOMOYO Linux patches.
3939 mkdir -p ~/rpmbuild/SOURCES/
4040 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
41-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
41+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
4242 then
43- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
43+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
4444 fi
4545
4646 # Install kernel source packages.
@@ -52,7 +52,7 @@
5252
5353 # Apply patches and create kernel config.
5454 cd linux-source-2.6.32 || die "Can't chdir to linux-source-2.6.32/ ."
55-tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180401.tar.gz || die "Can't extract patch."
55+tar -zxf ~/rpmbuild/SOURCES/ccs-patch-1.8.5-20180522.tar.gz || die "Can't extract patch."
5656 patch -p1 < patches/ccs-patch-2.6.32-debian-squeeze.diff || die "Can't apply patch."
5757 cat /boot/config-2.6.32-5-686 config.ccs > .config || die "Can't create config."
5858
--- trunk/1.8.x/ccs-patch/specs/build-ax3-2.6.18.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-ax3-2.6.18.sh (revision 6649)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.18-398.1.AXS3.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/asianux/SOURCES/ || die "Can't chdir to /usr/src/asianux/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
21+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -61,7 +61,7 @@
6161 # end of Asianux patches
6262
6363 +# TOMOYO Linux
64-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
64++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
6565 +patch -sp1 < patches/ccs-patch-2.6.18-asianux-3.diff
6666 +
6767 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-c3-2.4.21.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-c3-2.4.21.sh (revision 6649)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.4.21-63.EL.src.rpm || die "Can't install source package."
1919
2020 cd /usr/src/redhat/SOURCES/ || die "Can't chdir to /usr/src/redhat/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
21+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -51,7 +51,7 @@
5151 # END OF PATCH APPLICATIONS
5252
5353 +# TOMOYO Linux
54-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
54++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
5555 +patch -sp1 < patches/ccs-patch-2.4.21-centos-3.diff
5656 +
5757 cp %{SOURCE10} Documentation/
--- trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-c7-3.10.sh (revision 6649)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-3.10.0-862.2.3.el7.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
21+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
2222 then
23- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
23+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -69,7 +69,7 @@
6969 ApplyOptionalPatch debrand-rh-i686-cpu.patch
7070
7171 +# TOMOYO Linux
72-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
72++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
7373 +patch -sp1 < patches/ccs-patch-3.10-centos-7.diff
7474 +
7575 # Any further pre-build tree manipulations happen here.
--- trunk/1.8.x/ccs-patch/specs/build-suse12.3-3.7.sh (revision 6648)
+++ trunk/1.8.x/ccs-patch/specs/build-suse12.3-3.7.sh (revision 6649)
@@ -75,9 +75,9 @@
7575 rpm -ivh kernel-default-3.7.10-1.45.1.nosrc.rpm || die "Can't install source package."
7676
7777 cd /usr/src/packages/SOURCES/ || die "Can't chdir to /usr/src/packages/SOURCES/ ."
78-if [ ! -r ccs-patch-1.8.5-20180401.tar.gz ]
78+if [ ! -r ccs-patch-1.8.5-20180522.tar.gz ]
7979 then
80- wget -O ccs-patch-1.8.5-20180401.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180401.tar.gz' || die "Can't download patch."
80+ wget -O ccs-patch-1.8.5-20180522.tar.gz 'http://osdn.jp/frs/redir.php?f=/tomoyo/49684/ccs-patch-1.8.5-20180522.tar.gz' || die "Can't download patch."
8181 fi
8282
8383 cd /tmp/ || die "Can't chdir to /tmp/ ."
@@ -105,7 +105,7 @@
105105 %_sourcedir/series.conf .. $SYMBOLS
106106
107107 +# TOMOYO Linux
108-+tar -zxf %_sourcedir/ccs-patch-1.8.5-20180401.tar.gz
108++tar -zxf %_sourcedir/ccs-patch-1.8.5-20180522.tar.gz
109109 +patch -sp1 < patches/ccs-patch-3.7-suse-12.3.diff
110110 +cat config.ccs >> ../config/%cpu_arch_flavor
111111 +
--- trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6648)
+++ trunk/1.8.x/ccs-patch/patches/ccs-patch-3.13-ubuntu-14.04.diff (revision 6649)
@@ -29,8 +29,8 @@
2929 security/security.c | 107 ++++++++++++++++++++++++++++++++++++++++------
3030 25 files changed, 236 insertions(+), 37 deletions(-)
3131
32---- linux-3.13.0-147.196.orig/fs/exec.c
33-+++ linux-3.13.0-147.196/fs/exec.c
32+--- linux-3.13.0-149.199.orig/fs/exec.c
33++++ linux-3.13.0-149.199/fs/exec.c
3434 @@ -1482,7 +1482,7 @@ static int exec_binprm(struct linux_binp
3535 old_vpid = task_pid_nr_ns(current, task_active_pid_ns(current->parent));
3636 rcu_read_unlock();
@@ -40,8 +40,8 @@
4040 if (ret >= 0) {
4141 audit_bprm(bprm);
4242 trace_sched_process_exec(current, old_pid, bprm);
43---- linux-3.13.0-147.196.orig/fs/open.c
44-+++ linux-3.13.0-147.196/fs/open.c
43+--- linux-3.13.0-149.199.orig/fs/open.c
44++++ linux-3.13.0-149.199/fs/open.c
4545 @@ -1088,6 +1088,8 @@ EXPORT_SYMBOL(sys_close);
4646 */
4747 SYSCALL_DEFINE0(vhangup)
@@ -51,8 +51,8 @@
5151 if (capable(CAP_SYS_TTY_CONFIG)) {
5252 tty_vhangup_self();
5353 return 0;
54---- linux-3.13.0-147.196.orig/fs/proc/version.c
55-+++ linux-3.13.0-147.196/fs/proc/version.c
54+--- linux-3.13.0-149.199.orig/fs/proc/version.c
55++++ linux-3.13.0-149.199/fs/proc/version.c
5656 @@ -32,3 +32,10 @@ static int __init proc_version_init(void
5757 return 0;
5858 }
@@ -60,12 +60,12 @@
6060 +
6161 +static int __init ccs_show_version(void)
6262 +{
63-+ printk(KERN_INFO "Hook version: 3.13.0-147.196 2018/05/13\n");
63++ printk(KERN_INFO "Hook version: 3.13.0-149.199 2018/05/22\n");
6464 + return 0;
6565 +}
6666 +module_init(ccs_show_version);
67---- linux-3.13.0-147.196.orig/include/linux/init_task.h
68-+++ linux-3.13.0-147.196/include/linux/init_task.h
67+--- linux-3.13.0-149.199.orig/include/linux/init_task.h
68++++ linux-3.13.0-149.199/include/linux/init_task.h
6969 @@ -155,6 +155,14 @@ extern struct task_group root_task_group
7070
7171 #define INIT_TASK_COMM "swapper"
@@ -89,8 +89,8 @@
8989 }
9090
9191
92---- linux-3.13.0-147.196.orig/include/linux/sched.h
93-+++ linux-3.13.0-147.196/include/linux/sched.h
92+--- linux-3.13.0-149.199.orig/include/linux/sched.h
93++++ linux-3.13.0-149.199/include/linux/sched.h
9494 @@ -4,6 +4,8 @@
9595 #include <uapi/linux/sched.h>
9696
@@ -111,8 +111,8 @@
111111 };
112112
113113 /* Future-safe accessor for struct task_struct's cpus_allowed. */
114---- linux-3.13.0-147.196.orig/include/linux/security.h
115-+++ linux-3.13.0-147.196/include/linux/security.h
114+--- linux-3.13.0-149.199.orig/include/linux/security.h
115++++ linux-3.13.0-149.199/include/linux/security.h
116116 @@ -53,6 +53,7 @@ struct msg_queue;
117117 struct xattr;
118118 struct xfrm_sec_ctx;
@@ -314,8 +314,8 @@
314314 }
315315 #endif /* CONFIG_SECURITY_PATH */
316316
317---- linux-3.13.0-147.196.orig/include/net/ip.h
318-+++ linux-3.13.0-147.196/include/net/ip.h
317+--- linux-3.13.0-149.199.orig/include/net/ip.h
318++++ linux-3.13.0-149.199/include/net/ip.h
319319 @@ -225,6 +225,8 @@ void inet_get_local_port_range(struct ne
320320 extern unsigned long *sysctl_local_reserved_ports;
321321 static inline int inet_is_reserved_local_port(int port)
@@ -325,8 +325,8 @@
325325 return test_bit(port, sysctl_local_reserved_ports);
326326 }
327327
328---- linux-3.13.0-147.196.orig/kernel/fork.c
329-+++ linux-3.13.0-147.196/kernel/fork.c
328+--- linux-3.13.0-149.199.orig/kernel/fork.c
329++++ linux-3.13.0-149.199/kernel/fork.c
330330 @@ -250,6 +250,7 @@ void __put_task_struct(struct task_struc
331331 delayacct_tsk_free(tsk);
332332 put_signal_struct(tsk->signal);
@@ -353,8 +353,8 @@
353353 bad_fork_cleanup_perf:
354354 perf_event_free_task(p);
355355 bad_fork_cleanup_policy:
356---- linux-3.13.0-147.196.orig/kernel/kexec.c
357-+++ linux-3.13.0-147.196/kernel/kexec.c
356+--- linux-3.13.0-149.199.orig/kernel/kexec.c
357++++ linux-3.13.0-149.199/kernel/kexec.c
358358 @@ -38,6 +38,7 @@
359359 #include <asm/uaccess.h>
360360 #include <asm/io.h>
@@ -372,8 +372,8 @@
372372
373373 /*
374374 * Verify we have a legal set of flags
375---- linux-3.13.0-147.196.orig/kernel/module.c
376-+++ linux-3.13.0-147.196/kernel/module.c
375+--- linux-3.13.0-149.199.orig/kernel/module.c
376++++ linux-3.13.0-149.199/kernel/module.c
377377 @@ -63,6 +63,7 @@
378378 #include <linux/fips.h>
379379 #include <uapi/linux/module.h>
@@ -400,8 +400,8 @@
400400
401401 return 0;
402402 }
403---- linux-3.13.0-147.196.orig/kernel/ptrace.c
404-+++ linux-3.13.0-147.196/kernel/ptrace.c
403+--- linux-3.13.0-149.199.orig/kernel/ptrace.c
404++++ linux-3.13.0-149.199/kernel/ptrace.c
405405 @@ -1055,6 +1055,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
406406 {
407407 struct task_struct *child;
@@ -426,8 +426,8 @@
426426
427427 if (request == PTRACE_TRACEME) {
428428 ret = ptrace_traceme();
429---- linux-3.13.0-147.196.orig/kernel/reboot.c
430-+++ linux-3.13.0-147.196/kernel/reboot.c
429+--- linux-3.13.0-149.199.orig/kernel/reboot.c
430++++ linux-3.13.0-149.199/kernel/reboot.c
431431 @@ -16,6 +16,7 @@
432432 #include <linux/syscalls.h>
433433 #include <linux/syscore_ops.h>
@@ -445,8 +445,8 @@
445445
446446 /*
447447 * If pid namespaces are enabled and the current task is in a child
448---- linux-3.13.0-147.196.orig/kernel/sched/core.c
449-+++ linux-3.13.0-147.196/kernel/sched/core.c
448+--- linux-3.13.0-149.199.orig/kernel/sched/core.c
449++++ linux-3.13.0-149.199/kernel/sched/core.c
450450 @@ -2922,6 +2922,8 @@ int can_nice(const struct task_struct *p
451451 SYSCALL_DEFINE1(nice, int, increment)
452452 {
@@ -456,8 +456,8 @@
456456
457457 /*
458458 * Setpriority might change our priority at the same moment.
459---- linux-3.13.0-147.196.orig/kernel/signal.c
460-+++ linux-3.13.0-147.196/kernel/signal.c
459+--- linux-3.13.0-149.199.orig/kernel/signal.c
460++++ linux-3.13.0-149.199/kernel/signal.c
461461 @@ -2909,6 +2909,8 @@ SYSCALL_DEFINE4(rt_sigtimedwait, const s
462462 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
463463 {
@@ -503,9 +503,9 @@
503503
504504 return do_send_specific(tgid, pid, sig, info);
505505 }
506---- linux-3.13.0-147.196.orig/kernel/sys.c
507-+++ linux-3.13.0-147.196/kernel/sys.c
508-@@ -171,6 +171,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
506+--- linux-3.13.0-149.199.orig/kernel/sys.c
507++++ linux-3.13.0-149.199/kernel/sys.c
508+@@ -173,6 +173,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
509509
510510 if (which > PRIO_USER || which < PRIO_PROCESS)
511511 goto out;
@@ -516,7 +516,7 @@
516516
517517 /* normalize: avoid signed division (rounding problems) */
518518 error = -ESRCH;
519-@@ -1203,6 +1207,8 @@ SYSCALL_DEFINE2(sethostname, char __user
519+@@ -1205,6 +1209,8 @@ SYSCALL_DEFINE2(sethostname, char __user
520520
521521 if (len < 0 || len > __NEW_UTS_LEN)
522522 return -EINVAL;
@@ -525,7 +525,7 @@
525525 down_write(&uts_sem);
526526 errno = -EFAULT;
527527 if (!copy_from_user(tmp, name, len)) {
528-@@ -1253,6 +1259,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
528+@@ -1255,6 +1261,8 @@ SYSCALL_DEFINE2(setdomainname, char __us
529529 return -EPERM;
530530 if (len < 0 || len > __NEW_UTS_LEN)
531531 return -EINVAL;
@@ -534,8 +534,8 @@
534534
535535 down_write(&uts_sem);
536536 errno = -EFAULT;
537---- linux-3.13.0-147.196.orig/kernel/time/ntp.c
538-+++ linux-3.13.0-147.196/kernel/time/ntp.c
537+--- linux-3.13.0-149.199.orig/kernel/time/ntp.c
538++++ linux-3.13.0-149.199/kernel/time/ntp.c
539539 @@ -16,6 +16,7 @@
540540 #include <linux/mm.h>
541541 #include <linux/module.h>
@@ -569,8 +569,8 @@
569569
570570 /*
571571 * Check for potential multiplication overflows that can
572---- linux-3.13.0-147.196.orig/net/ipv4/raw.c
573-+++ linux-3.13.0-147.196/net/ipv4/raw.c
572+--- linux-3.13.0-149.199.orig/net/ipv4/raw.c
573++++ linux-3.13.0-149.199/net/ipv4/raw.c
574574 @@ -706,6 +706,10 @@ static int raw_recvmsg(struct kiocb *ioc
575575 skb = skb_recv_datagram(sk, flags, noblock, &err);
576576 if (!skb)
@@ -582,8 +582,8 @@
582582
583583 copied = skb->len;
584584 if (len < copied) {
585---- linux-3.13.0-147.196.orig/net/ipv4/udp.c
586-+++ linux-3.13.0-147.196/net/ipv4/udp.c
585+--- linux-3.13.0-149.199.orig/net/ipv4/udp.c
586++++ linux-3.13.0-149.199/net/ipv4/udp.c
587587 @@ -1247,6 +1247,10 @@ try_again:
588588 &peeked, &off, &err);
589589 if (!skb)
@@ -595,8 +595,8 @@
595595
596596 ulen = skb->len - sizeof(struct udphdr);
597597 copied = len;
598---- linux-3.13.0-147.196.orig/net/ipv6/raw.c
599-+++ linux-3.13.0-147.196/net/ipv6/raw.c
598+--- linux-3.13.0-149.199.orig/net/ipv6/raw.c
599++++ linux-3.13.0-149.199/net/ipv6/raw.c
600600 @@ -474,6 +474,10 @@ static int rawv6_recvmsg(struct kiocb *i
601601 skb = skb_recv_datagram(sk, flags, noblock, &err);
602602 if (!skb)
@@ -608,8 +608,8 @@
608608
609609 copied = skb->len;
610610 if (copied > len) {
611---- linux-3.13.0-147.196.orig/net/ipv6/udp.c
612-+++ linux-3.13.0-147.196/net/ipv6/udp.c
611+--- linux-3.13.0-149.199.orig/net/ipv6/udp.c
612++++ linux-3.13.0-149.199/net/ipv6/udp.c
613613 @@ -404,6 +404,10 @@ try_again:
614614 &peeked, &off, &err);
615615 if (!skb)
@@ -621,8 +621,8 @@
621621
622622 ulen = skb->len - sizeof(struct udphdr);
623623 copied = len;
624---- linux-3.13.0-147.196.orig/net/socket.c
625-+++ linux-3.13.0-147.196/net/socket.c
624+--- linux-3.13.0-149.199.orig/net/socket.c
625++++ linux-3.13.0-149.199/net/socket.c
626626 @@ -1616,6 +1616,10 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
627627 if (err < 0)
628628 goto out_fd;
@@ -634,8 +634,8 @@
634634 if (upeer_sockaddr) {
635635 if (newsock->ops->getname(newsock, (struct sockaddr *)&address,
636636 &len, 2) < 0) {
637---- linux-3.13.0-147.196.orig/net/unix/af_unix.c
638-+++ linux-3.13.0-147.196/net/unix/af_unix.c
637+--- linux-3.13.0-149.199.orig/net/unix/af_unix.c
638++++ linux-3.13.0-149.199/net/unix/af_unix.c
639639 @@ -1973,6 +1973,10 @@ static int unix_dgram_recvmsg(struct kio
640640 wake_up_interruptible_sync_poll(&u->peer_wait,
641641 POLLOUT | POLLWRNORM | POLLWRBAND);
@@ -647,8 +647,8 @@
647647 if (msg->msg_name)
648648 unix_copy_addr(msg, skb->sk);
649649
650---- linux-3.13.0-147.196.orig/security/Kconfig
651-+++ linux-3.13.0-147.196/security/Kconfig
650+--- linux-3.13.0-149.199.orig/security/Kconfig
651++++ linux-3.13.0-149.199/security/Kconfig
652652 @@ -177,5 +177,7 @@ config DEFAULT_SECURITY
653653 default "yama" if DEFAULT_SECURITY_YAMA
654654 default "" if DEFAULT_SECURITY_DAC
@@ -657,8 +657,8 @@
657657 +
658658 endmenu
659659
660---- linux-3.13.0-147.196.orig/security/Makefile
661-+++ linux-3.13.0-147.196/security/Makefile
660+--- linux-3.13.0-149.199.orig/security/Makefile
661++++ linux-3.13.0-149.199/security/Makefile
662662 @@ -27,3 +27,6 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_c
663663 # Object integrity file lists
664664 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -666,8 +666,8 @@
666666 +
667667 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
668668 +obj-$(CONFIG_CCSECURITY) += ccsecurity/built-in.o
669---- linux-3.13.0-147.196.orig/security/security.c
670-+++ linux-3.13.0-147.196/security/security.c
669+--- linux-3.13.0-149.199.orig/security/security.c
670++++ linux-3.13.0-149.199/security/security.c
671671 @@ -203,7 +203,10 @@ int security_syslog(int type)
672672
673673 int security_settime(const struct timespec *ts, const struct timezone *tz)
Show on old repository browser