• R/O
  • SSH
  • HTTPS

caitsith: Commit


Commit MetaInfo

Revision323 (tree)
Zeit2020-09-22 17:15:07
Autorkumaneko

Log Message

(empty log message)

Ändern Zusammenfassung

Diff

--- tags/htdocs/index.html (revision 322)
+++ tags/htdocs/index.html (revision 323)
@@ -304,12 +304,12 @@
304304 <p>Run the following commands in order to extract source code of CaitSith:</p>
305305
306306 <pre class="command">
307-# wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz'
308-# wget -O caitsith-patch-0.2-20200820.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz.asc'
307+# wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200922.tar.gz'
308+# wget -O caitsith-patch-0.2-20200922.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200922.tar.gz.asc'
309309 # wget https://tomoyo.osdn.jp/kumaneko-key
310310 # gpg --import kumaneko-key
311-# gpg caitsith-patch-0.2-20200820.tar.gz.asc
312-# tar -zxf caitsith-patch-0.2-20200820.tar.gz
311+# gpg caitsith-patch-0.2-20200922.tar.gz.asc
312+# tar -zxf caitsith-patch-0.2-20200922.tar.gz
313313 </pre>
314314
315315 <hr>
@@ -645,12 +645,12 @@
645645 Also, there are several patches which can be applied to distributor's latest kernels. For example "3.10-centos-7" if using CentOS 7's latest kernel:</p>
646646
647647 <pre class="command">
648-$ wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz'
649-$ wget -O caitsith-patch-0.2-20200820.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz.asc'
648+$ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200922.tar.gz'
649+$ wget -O caitsith-patch-0.2-20200922.tar.gz.asc 'https://osdn.jp/frs/redir.php?m=jaist&amp;f=/caitsith/66537/caitsith-patch-0.2-20200922.tar.gz.asc'
650650 $ wget https://tomoyo.osdn.jp/kumaneko-key
651651 $ gpg --import kumaneko-key
652-$ gpg caitsith-patch-0.2-20200820.tar.gz.asc
653-$ tar -zxf caitsith-patch-0.2-20200820.tar.gz
652+$ gpg caitsith-patch-0.2-20200922.tar.gz.asc
653+$ tar -zxf caitsith-patch-0.2-20200922.tar.gz
654654 $ sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' -- patches/ccs-patch-*.diff
655655 $ patch -sp1 &lt; patches/ccs-patch-$VERSION.diff
656656 </pre>
--- trunk/caitsith-patch/caitsith/probe.c (revision 322)
+++ trunk/caitsith-patch/caitsith/probe.c (revision 323)
@@ -225,7 +225,7 @@
225225 #if defined(CONFIG_ARM64)
226226
227227 /**
228- * probe_security_hook_heads_on_arm - Find security_hook_heads on ARM64.
228+ * probe_security_hook_heads_on_arm64 - Find security_hook_heads on ARM64.
229229 *
230230 * @base: Address of security_bprm_committed_creds().
231231 *
@@ -261,7 +261,7 @@
261261 tmp += offset;
262262 /*
263263 * Find
264- * ldr Xt, Xn, #uimm12
264+ * ldr Xt, [Xn, #uimm12]
265265 * sequence.
266266 */
267267 for (ip += 2; i < 32 - 2; ip++, i++) {
@@ -274,6 +274,38 @@
274274 }
275275 break;
276276 }
277+ for (i = 0; i < 32; ip++, i++) {
278+ unsigned long tmp;
279+ unsigned long offset;
280+
281+ /*
282+ * Find
283+ * adrp Xd, #imm21
284+ * sequence.
285+ */
286+ if ((*ip & 0x9F000000) != 0x90000000)
287+ continue;
288+ tmp = ((unsigned long) ip) & ~0xFFFUL;
289+ offset = (unsigned long) (((((*ip >> 5) & 0x007FFFF) << 2) |
290+ ((*ip >> 29) & 0x3))) << 12;
291+ if (offset & 0x100000000UL)
292+ offset |= 0xFFFFFFFF00000000UL;
293+ tmp += offset;
294+ /*
295+ * Find
296+ * ldr Xt, [Xn, #uimm12]
297+ * sequence.
298+ */
299+ for (ip += 1; i < 32 - 1; ip++, i++) {
300+ if ((*ip & 0xFFC00000) != 0xF9400000)
301+ continue;
302+ offset = ((*ip >> 10) & 0xFFF) << 3;
303+ tmp += offset;
304+ ip4ret = (unsigned int *) tmp;
305+ return &ip4ret;
306+ }
307+ break;
308+ }
277309 return NULL;
278310 }
279311
--- trunk/caitsith-patch/patches/ccs-patch-5.9.diff (revision 322)
+++ trunk/caitsith-patch/patches/ccs-patch-5.9.diff (revision 323)
@@ -1,6 +1,6 @@
1-This is TOMOYO Linux patch for kernel 5.9-rc5.
1+This is TOMOYO Linux patch for kernel 5.9-rc6.
22
3-Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.9-rc5.tar.gz
3+Source code for this patch is https://git.kernel.org/torvalds/t/linux-5.9-rc6.tar.gz
44 ---
55 fs/exec.c | 2 -
66 fs/open.c | 2 +
@@ -28,8 +28,8 @@
2828 security/security.c | 5 ++-
2929 24 files changed, 160 insertions(+), 30 deletions(-)
3030
31---- linux-5.9-rc5.orig/fs/exec.c
32-+++ linux-5.9-rc5/fs/exec.c
31+--- linux-5.9-rc6.orig/fs/exec.c
32++++ linux-5.9-rc6/fs/exec.c
3333 @@ -1928,7 +1928,7 @@ static int bprm_execve(struct linux_binp
3434 if (retval)
3535 goto out;
@@ -39,8 +39,8 @@
3939 if (retval < 0)
4040 goto out;
4141
42---- linux-5.9-rc5.orig/fs/open.c
43-+++ linux-5.9-rc5/fs/open.c
42+--- linux-5.9-rc6.orig/fs/open.c
43++++ linux-5.9-rc6/fs/open.c
4444 @@ -1327,6 +1327,8 @@ SYSCALL_DEFINE3(close_range, unsigned in
4545 */
4646 SYSCALL_DEFINE0(vhangup)
@@ -50,8 +50,8 @@
5050 if (capable(CAP_SYS_TTY_CONFIG)) {
5151 tty_vhangup_self();
5252 return 0;
53---- linux-5.9-rc5.orig/fs/proc/version.c
54-+++ linux-5.9-rc5/fs/proc/version.c
53+--- linux-5.9-rc6.orig/fs/proc/version.c
54++++ linux-5.9-rc6/fs/proc/version.c
5555 @@ -21,3 +21,10 @@ static int __init proc_version_init(void
5656 return 0;
5757 }
@@ -59,12 +59,12 @@
5959 +
6060 +static int __init ccs_show_version(void)
6161 +{
62-+ printk(KERN_INFO "Hook version: 5.9-rc5 2020/09/15\n");
62++ printk(KERN_INFO "Hook version: 5.9-rc6 2020/09/21\n");
6363 + return 0;
6464 +}
6565 +fs_initcall(ccs_show_version);
66---- linux-5.9-rc5.orig/include/linux/sched.h
67-+++ linux-5.9-rc5/include/linux/sched.h
66+--- linux-5.9-rc6.orig/include/linux/sched.h
67++++ linux-5.9-rc6/include/linux/sched.h
6868 @@ -41,6 +41,7 @@ struct backing_dev_info;
6969 struct bio_list;
7070 struct blk_plug;
@@ -84,8 +84,8 @@
8484
8585 #ifdef CONFIG_GCC_PLUGIN_STACKLEAK
8686 unsigned long lowest_stack;
87---- linux-5.9-rc5.orig/include/linux/security.h
88-+++ linux-5.9-rc5/include/linux/security.h
87+--- linux-5.9-rc6.orig/include/linux/security.h
88++++ linux-5.9-rc6/include/linux/security.h
8989 @@ -58,6 +58,7 @@ struct fs_parameter;
9090 enum fs_value_type;
9191 struct watch;
@@ -315,8 +315,8 @@
315315 }
316316 #endif /* CONFIG_SECURITY_PATH */
317317
318---- linux-5.9-rc5.orig/include/net/ip.h
319-+++ linux-5.9-rc5/include/net/ip.h
318+--- linux-5.9-rc6.orig/include/net/ip.h
319++++ linux-5.9-rc6/include/net/ip.h
320320 @@ -338,6 +338,8 @@ void inet_get_local_port_range(struct ne
321321 #ifdef CONFIG_SYSCTL
322322 static inline bool inet_is_local_reserved_port(struct net *net, unsigned short port)
@@ -335,8 +335,8 @@
335335 return false;
336336 }
337337
338---- linux-5.9-rc5.orig/init/init_task.c
339-+++ linux-5.9-rc5/init/init_task.c
338+--- linux-5.9-rc6.orig/init/init_task.c
339++++ linux-5.9-rc6/init/init_task.c
340340 @@ -209,6 +209,10 @@ struct task_struct init_task
341341 #ifdef CONFIG_SECCOMP
342342 .seccomp = { .filter_count = ATOMIC_INIT(0) },
@@ -348,8 +348,8 @@
348348 };
349349 EXPORT_SYMBOL(init_task);
350350
351---- linux-5.9-rc5.orig/kernel/kexec.c
352-+++ linux-5.9-rc5/kernel/kexec.c
351+--- linux-5.9-rc6.orig/kernel/kexec.c
352++++ linux-5.9-rc6/kernel/kexec.c
353353 @@ -16,7 +16,7 @@
354354 #include <linux/syscalls.h>
355355 #include <linux/vmalloc.h>
@@ -368,8 +368,8 @@
368368
369369 /* Permit LSMs and IMA to fail the kexec */
370370 result = security_kernel_load_data(LOADING_KEXEC_IMAGE);
371---- linux-5.9-rc5.orig/kernel/module.c
372-+++ linux-5.9-rc5/kernel/module.c
371+--- linux-5.9-rc6.orig/kernel/module.c
372++++ linux-5.9-rc6/kernel/module.c
373373 @@ -58,6 +58,7 @@
374374 #include <linux/audit.h>
375375 #include <uapi/linux/module.h>
@@ -396,8 +396,8 @@
396396
397397 return 0;
398398 }
399---- linux-5.9-rc5.orig/kernel/ptrace.c
400-+++ linux-5.9-rc5/kernel/ptrace.c
399+--- linux-5.9-rc6.orig/kernel/ptrace.c
400++++ linux-5.9-rc6/kernel/ptrace.c
401401 @@ -1244,6 +1244,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
402402 {
403403 struct task_struct *child;
@@ -422,8 +422,8 @@
422422
423423 if (request == PTRACE_TRACEME) {
424424 ret = ptrace_traceme();
425---- linux-5.9-rc5.orig/kernel/reboot.c
426-+++ linux-5.9-rc5/kernel/reboot.c
425+--- linux-5.9-rc6.orig/kernel/reboot.c
426++++ linux-5.9-rc6/kernel/reboot.c
427427 @@ -17,6 +17,7 @@
428428 #include <linux/syscalls.h>
429429 #include <linux/syscore_ops.h>
@@ -441,8 +441,8 @@
441441
442442 /*
443443 * If pid namespaces are enabled and the current task is in a child
444---- linux-5.9-rc5.orig/kernel/sched/core.c
445-+++ linux-5.9-rc5/kernel/sched/core.c
444+--- linux-5.9-rc6.orig/kernel/sched/core.c
445++++ linux-5.9-rc6/kernel/sched/core.c
446446 @@ -5030,6 +5030,8 @@ int can_nice(const struct task_struct *p
447447 SYSCALL_DEFINE1(nice, int, increment)
448448 {
@@ -452,8 +452,8 @@
452452
453453 /*
454454 * Setpriority might change our priority at the same moment.
455---- linux-5.9-rc5.orig/kernel/signal.c
456-+++ linux-5.9-rc5/kernel/signal.c
455+--- linux-5.9-rc6.orig/kernel/signal.c
456++++ linux-5.9-rc6/kernel/signal.c
457457 @@ -3657,6 +3657,8 @@ static inline void prepare_kill_siginfo(
458458 SYSCALL_DEFINE2(kill, pid_t, pid, int, sig)
459459 {
@@ -521,8 +521,8 @@
521521
522522 return do_send_specific(tgid, pid, sig, info);
523523 }
524---- linux-5.9-rc5.orig/kernel/sys.c
525-+++ linux-5.9-rc5/kernel/sys.c
524+--- linux-5.9-rc6.orig/kernel/sys.c
525++++ linux-5.9-rc6/kernel/sys.c
526526 @@ -205,6 +205,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
527527
528528 if (which > PRIO_USER || which < PRIO_PROCESS)
@@ -552,8 +552,8 @@
552552
553553 errno = -EFAULT;
554554 if (!copy_from_user(tmp, name, len)) {
555---- linux-5.9-rc5.orig/kernel/time/timekeeping.c
556-+++ linux-5.9-rc5/kernel/time/timekeeping.c
555+--- linux-5.9-rc6.orig/kernel/time/timekeeping.c
556++++ linux-5.9-rc6/kernel/time/timekeeping.c
557557 @@ -22,6 +22,7 @@
558558 #include <linux/pvclock_gtod.h>
559559 #include <linux/compiler.h>
@@ -587,8 +587,8 @@
587587
588588 /*
589589 * Validate if a timespec/timeval used to inject a time
590---- linux-5.9-rc5.orig/net/ipv4/raw.c
591-+++ linux-5.9-rc5/net/ipv4/raw.c
590+--- linux-5.9-rc6.orig/net/ipv4/raw.c
591++++ linux-5.9-rc6/net/ipv4/raw.c
592592 @@ -767,6 +767,10 @@ static int raw_recvmsg(struct sock *sk,
593593 skb = skb_recv_datagram(sk, flags, noblock, &err);
594594 if (!skb)
@@ -600,8 +600,8 @@
600600
601601 copied = skb->len;
602602 if (len < copied) {
603---- linux-5.9-rc5.orig/net/ipv4/udp.c
604-+++ linux-5.9-rc5/net/ipv4/udp.c
603+--- linux-5.9-rc6.orig/net/ipv4/udp.c
604++++ linux-5.9-rc6/net/ipv4/udp.c
605605 @@ -1801,6 +1801,8 @@ try_again:
606606 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
607607 if (!skb)
@@ -611,8 +611,8 @@
611611
612612 ulen = udp_skb_len(skb);
613613 copied = len;
614---- linux-5.9-rc5.orig/net/ipv6/raw.c
615-+++ linux-5.9-rc5/net/ipv6/raw.c
614+--- linux-5.9-rc6.orig/net/ipv6/raw.c
615++++ linux-5.9-rc6/net/ipv6/raw.c
616616 @@ -480,6 +480,10 @@ static int rawv6_recvmsg(struct sock *sk
617617 skb = skb_recv_datagram(sk, flags, noblock, &err);
618618 if (!skb)
@@ -624,8 +624,8 @@
624624
625625 copied = skb->len;
626626 if (copied > len) {
627---- linux-5.9-rc5.orig/net/ipv6/udp.c
628-+++ linux-5.9-rc5/net/ipv6/udp.c
627+--- linux-5.9-rc6.orig/net/ipv6/udp.c
628++++ linux-5.9-rc6/net/ipv6/udp.c
629629 @@ -343,6 +343,8 @@ try_again:
630630 skb = __skb_recv_udp(sk, flags, noblock, &off, &err);
631631 if (!skb)
@@ -635,8 +635,8 @@
635635
636636 ulen = udp6_skb_len(skb);
637637 copied = len;
638---- linux-5.9-rc5.orig/net/socket.c
639-+++ linux-5.9-rc5/net/socket.c
638+--- linux-5.9-rc6.orig/net/socket.c
639++++ linux-5.9-rc6/net/socket.c
640640 @@ -1755,6 +1755,10 @@ int __sys_accept4_file(struct file *file
641641 if (err < 0)
642642 goto out_fd;
@@ -648,8 +648,8 @@
648648 if (upeer_sockaddr) {
649649 len = newsock->ops->getname(newsock,
650650 (struct sockaddr *)&address, 2);
651---- linux-5.9-rc5.orig/net/unix/af_unix.c
652-+++ linux-5.9-rc5/net/unix/af_unix.c
651+--- linux-5.9-rc6.orig/net/unix/af_unix.c
652++++ linux-5.9-rc6/net/unix/af_unix.c
653653 @@ -2130,6 +2130,10 @@ static int unix_dgram_recvmsg(struct soc
654654 EPOLLOUT | EPOLLWRNORM |
655655 EPOLLWRBAND);
@@ -669,8 +669,8 @@
669669 mutex_unlock(&u->iolock);
670670 out:
671671 return err;
672---- linux-5.9-rc5.orig/security/Kconfig
673-+++ linux-5.9-rc5/security/Kconfig
672+--- linux-5.9-rc6.orig/security/Kconfig
673++++ linux-5.9-rc6/security/Kconfig
674674 @@ -291,5 +291,7 @@ config LSM
675675
676676 source "security/Kconfig.hardening"
@@ -679,8 +679,8 @@
679679 +
680680 endmenu
681681
682---- linux-5.9-rc5.orig/security/Makefile
683-+++ linux-5.9-rc5/security/Makefile
682+--- linux-5.9-rc6.orig/security/Makefile
683++++ linux-5.9-rc6/security/Makefile
684684 @@ -36,3 +36,6 @@ obj-$(CONFIG_BPF_LSM) += bpf/
685685 # Object integrity file lists
686686 subdir-$(CONFIG_INTEGRITY) += integrity
@@ -688,8 +688,8 @@
688688 +
689689 +subdir-$(CONFIG_CCSECURITY) += ccsecurity
690690 +obj-$(CONFIG_CCSECURITY) += ccsecurity/
691---- linux-5.9-rc5.orig/security/security.c
692-+++ linux-5.9-rc5/security/security.c
691+--- linux-5.9-rc6.orig/security/security.c
692++++ linux-5.9-rc6/security/security.c
693693 @@ -1584,7 +1584,9 @@ int security_task_alloc(struct task_stru
694694
695695 if (rc)
--- trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 322)
+++ trunk/caitsith-patch/specs/build-c6-2.6.32.sh (revision 323)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-2.6.32-754.33.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 caitsith-patch-0.2-20200820.tar.gz ]
21+if [ ! -r caitsith-patch-0.2-20200922.tar.gz ]
2222 then
23- wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz' || die "Can't download patch."
23+ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200922.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 +# CaitSith
72-+tar -zxf %_sourcedir/caitsith-patch-0.2-20200820.tar.gz
72++tar -zxf %_sourcedir/caitsith-patch-0.2-20200922.tar.gz
7373 +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
7474 +patch -sp1 < patches/ccs-patch-2.6.32-centos-6.diff
7575 # Any further pre-build tree manipulations happen here.
--- trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 322)
+++ trunk/caitsith-patch/specs/build-c7-3.10.sh (revision 323)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-3.10.0-1127.19.1.el7.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r caitsith-patch-0.2-20200820.tar.gz ]
21+if [ ! -r caitsith-patch-0.2-20200922.tar.gz ]
2222 then
23- wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz' || die "Can't download patch."
23+ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200922.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 +# CaitSith
72-+tar -zxf %_sourcedir/caitsith-patch-0.2-20200820.tar.gz
72++tar -zxf %_sourcedir/caitsith-patch-0.2-20200922.tar.gz
7373 +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
7474 +patch -sp1 < patches/ccs-patch-3.10-centos-7.diff
7575 # Any further pre-build tree manipulations happen here.
--- trunk/caitsith-patch/specs/build-c8-4.18.sh (revision 322)
+++ trunk/caitsith-patch/specs/build-c8-4.18.sh (revision 323)
@@ -18,9 +18,9 @@
1818 rpm -ivh kernel-4.18.0-193.19.1.el8_2.src.rpm || die "Can't install source package."
1919
2020 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
21-if [ ! -r caitsith-patch-0.2-20200820.tar.gz ]
21+if [ ! -r caitsith-patch-0.2-20200922.tar.gz ]
2222 then
23- wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz' || die "Can't download patch."
23+ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200922.tar.gz' || die "Can't download patch."
2424 fi
2525
2626 cd ~/rpmbuild/SPECS/ || die "Can't chdir to ~/rpmbuild/SPECS/ ."
@@ -42,7 +42,7 @@
4242 # END OF PATCH APPLICATIONS
4343
4444 +# CaitSith
45-+tar -zxf %_sourcedir/caitsith-patch-0.2-20200820.tar.gz
45++tar -zxf %_sourcedir/caitsith-patch-0.2-20200922.tar.gz
4646 +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
4747 +patch -sp1 < patches/ccs-patch-4.18-centos-8.diff
4848 # Any further pre-build tree manipulations happen here.
--- trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 322)
+++ trunk/caitsith-patch/specs/build-debian_wheezy.sh (revision 323)
@@ -23,10 +23,10 @@
2323 # Download CaitSith patches.
2424 mkdir -p ~/rpmbuild/SOURCES/
2525 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
26-if [ ! -r caitsith-patch-0.2-20200820.tar.gz ]
26+if [ ! -r caitsith-patch-0.2-20200922.tar.gz ]
2727 then
2828 apt-get -y install wget
29- wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz' || die "Can't download patch."
29+ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200922.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/caitsith-patch-0.2-20200820.tar.gz || die "Can't extract patch."
41+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20200922.tar.gz || die "Can't extract patch."
4242 sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
4343 patch -p1 < patches/ccs-patch-3.2-debian-wheezy.diff || die "Can't apply patch."
4444 cat /boot/config-3.2.0-$ABI_VERSION-$ORIGINAL_FLAVOUR config.caitsith > .config || die "Can't create config."
--- trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 322)
+++ trunk/caitsith-patch/specs/build-ubuntu_12.04.sh (revision 323)
@@ -29,9 +29,9 @@
2929 # Download CaitSith patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r caitsith-patch-0.2-20200820.tar.gz ]
32+if [ ! -r caitsith-patch-0.2-20200922.tar.gz ]
3333 then
34- wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz' || die "Can't download patch."
34+ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200922.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/caitsith-patch-0.2-20200820.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20200922.tar.gz || die "Can't extract patch."
4848 sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
4949 patch -p1 < patches/ccs-patch-3.2-ubuntu-12.04.diff || die "Can't apply patch."
5050 rm -fR patches/ specs/ || die "Can't delete patch."
--- trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 322)
+++ trunk/caitsith-patch/specs/build-ubuntu_14.04.sh (revision 323)
@@ -29,9 +29,9 @@
2929 # Download CaitSith patches.
3030 mkdir -p ~/rpmbuild/SOURCES/
3131 cd ~/rpmbuild/SOURCES/ || die "Can't chdir to ~/rpmbuild/SOURCES/ ."
32-if [ ! -r caitsith-patch-0.2-20200820.tar.gz ]
32+if [ ! -r caitsith-patch-0.2-20200922.tar.gz ]
3333 then
34- wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz' || die "Can't download patch."
34+ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200922.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/caitsith-patch-0.2-20200820.tar.gz || die "Can't extract patch."
47+tar -zxf ~/rpmbuild/SOURCES/caitsith-patch-0.2-20200922.tar.gz || die "Can't extract patch."
4848 sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
4949 patch -p1 < patches/ccs-patch-3.13-ubuntu-14.04.diff || die "Can't apply patch."
5050 rm -fR patches/ specs/ || die "Can't delete patch."
--- trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 322)
+++ trunk/caitsith-patch/specs/build-vl6-4.4.sh (revision 323)
@@ -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 caitsith-patch-0.2-20200820.tar.gz ]
21+if [ ! -r caitsith-patch-0.2-20200922.tar.gz ]
2222 then
23- wget -O caitsith-patch-0.2-20200820.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200820.tar.gz' || die "Can't download patch."
23+ wget -O caitsith-patch-0.2-20200922.tar.gz 'https://osdn.jp/frs/redir.php?f=/caitsith/66537/caitsith-patch-0.2-20200922.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 +# CaitSith
64-+tar -zxf %_sourcedir/caitsith-patch-0.2-20200820.tar.gz
64++tar -zxf %_sourcedir/caitsith-patch-0.2-20200922.tar.gz
6565 +sed -i -e 's/CCSECURITY/CAITSITH/g' -e 's/ccsecurity/caitsith/g' -e 's/ccs_domain_info/cs_domain_info/g' -e 's/ccs_flags/cs_flags/g' patches/ccs-patch-*.diff
6666 +patch -sp1 < patches/ccs-patch-4.4-vine-linux-6.diff
6767 cp %{SOURCE10} Documentation/
Show on old repository browser