From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 6 Jul 2010 12:19:11 +0000 (+0200)
Subject: python: Remove patches that add constants to the socket module.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7379dba7a322c47369cbcacf0e8265bc211481b7;p=ipfire-3.x.git

python: Remove patches that add constants to the socket module.
---

diff --git a/pkgs/core/python/patches/python-2.5.1-socketmodule-constants.patch b/pkgs/core/python/patches/python-2.5.1-socketmodule-constants.patch
deleted file mode 100644
index 9dd1579cb..000000000
--- a/pkgs/core/python/patches/python-2.5.1-socketmodule-constants.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- Python-2.5.1i-orig/Modules/socketmodule.c	2008-03-07 16:38:47.000000000 -0500
-+++ Python-2.5.1/Modules/socketmodule.c	2008-03-07 16:41:09.000000000 -0500
-@@ -4507,6 +4507,60 @@
- #ifdef	SO_TYPE
- 	PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
- #endif
-+#ifdef	SO_SNDBUFFORCE
-+	PyModule_AddIntConstant(m, "SO_SNDBUFFORCE", SO_SNDBUFFORCE);
-+#endif
-+#ifdef	SO_RCVBUFFORCE
-+	PyModule_AddIntConstant(m, "SO_RCVBUFFORCE", SO_RCVBUFFORCE);
-+#endif
-+#ifdef	SO_NO_CHECK
-+	PyModule_AddIntConstant(m, "SO_NO_CHECK", SO_NO_CHECK);
-+#endif
-+#ifdef	SO_PRIORITY
-+	PyModule_AddIntConstant(m, "SO_PRIORITY", SO_PRIORITY);
-+#endif
-+#ifdef	SO_BSDCOMPAT
-+	PyModule_AddIntConstant(m, "SO_BSDCOMPAT", SO_BSDCOMPAT);
-+#endif
-+#ifdef	SO_PASSCRED
-+	PyModule_AddIntConstant(m, "SO_PASSCRED", SO_PASSCRED);
-+#endif
-+#ifdef	SO_PEERCRED
-+	PyModule_AddIntConstant(m, "SO_PEERCRED", SO_PEERCRED);
-+#endif
-+#ifdef	SO_SECURITY_AUTHENTICATION
-+	PyModule_AddIntConstant(m, "SO_SECURITY_AUTHENTICATION", SO_SECURITY_AUTHENTICATION);
-+#endif
-+#ifdef	SO_SECURITY_ENCRYPTION_TRANSPORT
-+	PyModule_AddIntConstant(m, "SO_SECURITY_ENCRYPTION_TRANSPORT", SO_SECURITY_ENCRYPTION_TRANSPORT);
-+#endif
-+#ifdef	SO_SECURITY_ENCRYPTION_NETWORK
-+	PyModule_AddIntConstant(m, "SO_SECURITY_ENCRYPTION_NETWORK", SO_SECURITY_ENCRYPTION_NETWORK);
-+#endif
-+#ifdef	SO_BINDTODEVICE
-+	PyModule_AddIntConstant(m, "SO_BINDTODEVICE", SO_BINDTODEVICE);
-+#endif
-+#ifdef	SO_ATTACH_FILTER
-+	PyModule_AddIntConstant(m, "SO_ATTACH_FILTER", SO_ATTACH_FILTER);
-+#endif
-+#ifdef	SO_DETACH_FILTER
-+	PyModule_AddIntConstant(m, "SO_DETACH_FILTER", SO_DETACH_FILTER);
-+#endif
-+#ifdef	SO_PEERNAME
-+	PyModule_AddIntConstant(m, "SO_PEERNAME", SO_PEERNAME);
-+#endif
-+#ifdef	SO_TIMESTAMP
-+	PyModule_AddIntConstant(m, "SO_TIMESTAMP", SO_TIMESTAMP);
-+#endif
-+#ifdef	SO_PEERSEC
-+	PyModule_AddIntConstant(m, "SO_PEERSEC", SO_PEERSEC);
-+#endif
-+#ifdef	SO_PASSSEC
-+	PyModule_AddIntConstant(m, "SO_PASSSEC", SO_PASSSEC);
-+#endif
-+#ifdef	SO_TIMESTAMPNS
-+	PyModule_AddIntConstant(m, "SO_TIMESTAMPNS", SO_TIMESTAMPNS);
-+#endif
- 
- 	/* Maximum number of connections for "listen" */
- #ifdef	SOMAXCONN
diff --git a/pkgs/core/python/patches/python-2.5.1-socketmodule-constants2.patch b/pkgs/core/python/patches/python-2.5.1-socketmodule-constants2.patch
deleted file mode 100644
index 93008b9b6..000000000
--- a/pkgs/core/python/patches/python-2.5.1-socketmodule-constants2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rup Python-2.5.1-orig/Modules/socketmodule.c Python-2.5.1/Modules/socketmodule.c
---- Python-2.5.1-orig/Modules/socketmodule.c	2008-03-25 09:59:38.000000000 -0400
-+++ Python-2.5.1/Modules/socketmodule.c	2008-03-25 10:12:24.000000000 -0400
-@@ -4977,6 +4977,15 @@ init_socket(void)
- #ifdef	TCP_QUICKACK
- 	PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
- #endif
-+#ifdef	TCP_CONGESTION
-+	PyModule_AddIntConstant(m, "TCP_CONGESTION", TCP_CONGESTION);
-+#endif
-+#ifdef	TCP_MD5SIG
-+	PyModule_AddIntConstant(m, "TCP_MD5SIG", TCP_MD5SIG);
-+#endif
-+#ifdef	TCP_MD5SIG_MAXKEYLEN
-+	PyModule_AddIntConstant(m, "TCP_MD5SIG_MAXKEYLEN", TCP_MD5SIG_MAXKEYLEN);
-+#endif
- 
- 
- 	/* IPX options */
-Only in Python-2.5.1/Modules: socketmodule.c~