Author: arekm Date: Tue Jul 6 13:36:08 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; patch fixed
---- Files affected:
packages/kernel:
kernel-grsec_fixes.patch (1.10 -> 1.11) , kernel.spec (1.796 -> 1.797)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_fixes.patch
diff -u packages/kernel/kernel-grsec_fixes.patch:1.10
packages/kernel/kernel-grsec_fixes.patch:1.11
--- packages/kernel/kernel-grsec_fixes.patch:1.10 Tue Jul 6 14:56:16 2010
+++ packages/kernel/kernel-grsec_fixes.patch Tue Jul 6 15:36:02 2010
@@ -172,8 +172,8 @@
spin_unlock(&dev->count_lock);
return can_switch;
}
---- linux-2.6.34/net/socket.c~ 2010-07-06 13:40:05.892545375 +0200
-+++ linux-2.6.34/net/socket.c 2010-07-06 14:53:01.074608654 +0200
+--- linux-2.6.34/net/socket.c~ 2010-07-06 15:35:03.398523320 +0200
++++ linux-2.6.34/net/socket.c 2010-07-06 15:35:26.021020905 +0200
@@ -1573,12 +1573,6 @@
newsock->type = sock->type;
newsock->ops = sock->ops;
@@ -184,6 +184,6 @@
- goto out_put;
- }
-
- /*
- * We don't need try_module_get here, as the listening socket (sock)
- * has the protocol module (sock->ops->owner) held.
+ err = gr_search_accept(sock);
+ if (err) {
+ sock_release(newsock);
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.796 packages/kernel/kernel.spec:1.797
--- packages/kernel/kernel.spec:1.796 Tue Jul 6 15:15:52 2010
+++ packages/kernel/kernel.spec Tue Jul 6 15:36:02 2010
@@ -116,7 +116,7 @@
%define basever 2.6.34
%define postver .1
-%define rel 1
+%define rel 2
%define _enable_debug_packages 0
@@ -1599,6 +1599,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.797 2010/07/06 13:36:02 arekm
+- rel 2; patch fixed
+
Revision 1.796 2010/07/06 13:15:52 arekm
- rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_fixes.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.796&r2=1.797&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
