From b7ef3faff5621f2fc26f3750a47818cd297b2dba Mon Sep 17 00:00:00 2001
From: James Antill <james@fedoraproject.org>
Date: Mar 08 2008 04:29:13 +0000
Subject: - Add constants to socketmodule

- Resolves: bug#436560

---

diff --git a/python-2.5.1-socketmodule-constants.patch b/python-2.5.1-socketmodule-constants.patch
new file mode 100644
index 0000000..9dd1579
--- /dev/null
+++ b/python-2.5.1-socketmodule-constants.patch
@@ -0,0 +1,63 @@
+--- 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/python.spec b/python.spec
index 57db3c4..eac2720 100644
--- a/python.spec
+++ b/python.spec
@@ -20,7 +20,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Name: %{python}
 Version: 2.5.1
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: Python Software Foundation License v2 
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -40,6 +40,7 @@ Patch9: python-2.5-tkinter.patch
 Patch10: python-2.5.1-binutils-no-dep.patch
 Patch11: python-2.5.1-codec-ascii-tolower.patch
 Patch12: python-2.5.1-pysqlite.patch
+Patch13: python-2.5.1-socketmodule-constants.patch
 
 # upstreamed
 
@@ -205,6 +206,7 @@ code that uses more than just unittest and/or test_support.py.
 %patch10 -p1 -b .binutils-no-dep
 %patch11 -p1 -b .ascii-tolower
 %patch12 -p1 -b .pysqlite-2.3.3-minimal
+%patch13 -p1 -b .socketmodule
 
 %ifarch alpha ia64
 # 64bit, but not lib64 arches need this too...
@@ -502,6 +504,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Sat Mar  8 2008 James Antill <jantill@redhat.com> - 2.5.1-22
+- Add constants to socketmodule
+- Resolves: bug#436560
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.5.1-22
 - Autorebuild for GCC 4.3