Attachment #237950 for bug #267648

View | Details | Raw Unified | Return to bug 267648
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/lang/python310/Makefile (+1 lines)
1	PORTNAME= python	1	PORTNAME= python
2	DISTVERSION= ${PYTHON_DISTVERSION}	2	DISTVERSION= ${PYTHON_DISTVERSION}
		3	PORTREVISION= 1
3	CATEGORIES= lang python	4	CATEGORIES= lang python
4	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}	5	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}
5	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	6	PKGNAMESUFFIX= ${PYTHON_SUFFIX}




--- Modules/socketmodule.c
+++ Modules/socketmodule.c
@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
         /* RDS sockets use sockaddr_in: fall-through */
 #endif /* AF_RDS */
 
+#ifdef AF_DIVERT
+    case AF_DIVERT:
+        /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
+#endif /* AF_DIVERT */
+
     case AF_INET:
     {
         struct maybe_idna host = {NULL, NULL};
@@ -7628,6 +7633,14 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, AF_SYSTEM);
 #endif
 
+/* FreeBSD divert(4) */
+#ifdef PF_DIVERT
+    PyModule_AddIntMacro(m, PF_DIVERT);
+#endif
+#ifdef AF_DIVERT
+    PyModule_AddIntMacro(m, AF_DIVERT);
+#endif
+
 #ifdef AF_PACKET
     PyModule_AddIntMacro(m, AF_PACKET);
 #endif

Lines 1-5 Link Here

(-)b/lang/python311/Makefile (+1 lines)
1	PORTNAME= python	1	PORTNAME= python
2	DISTVERSION= ${PYTHON_DISTVERSION}	2	DISTVERSION= ${PYTHON_DISTVERSION}
		3	PORTREVISION= 1
3	CATEGORIES= lang python	4	CATEGORIES= lang python
4	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}	5	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}
5	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	6	PKGNAMESUFFIX= ${PYTHON_SUFFIX}




--- Modules/socketmodule.c
+++ Modules/socketmodule.c
@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
         /* RDS sockets use sockaddr_in: fall-through */
 #endif /* AF_RDS */
 
+#ifdef AF_DIVERT
+    case AF_DIVERT:
+        /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
+#endif /* AF_DIVERT */
+
     case AF_INET:
     {
         struct maybe_idna host = {NULL, NULL};
@@ -7628,6 +7633,14 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, AF_SYSTEM);
 #endif
 
+/* FreeBSD divert(4) */
+#ifdef PF_DIVERT
+    PyModule_AddIntMacro(m, PF_DIVERT);
+#endif
+#ifdef AF_DIVERT
+    PyModule_AddIntMacro(m, AF_DIVERT);
+#endif
+
 #ifdef AF_PACKET
     PyModule_AddIntMacro(m, AF_PACKET);
 #endif

Lines 1-5 Link Here

(-)b/lang/python37/Makefile (+1 lines)
1	PORTNAME= python	1	PORTNAME= python
2	DISTVERSION= ${PYTHON_DISTVERSION}	2	DISTVERSION= ${PYTHON_DISTVERSION}
		3	PORTREVISION= 1
3	CATEGORIES= lang python	4	CATEGORIES= lang python
4	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}	5	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
5	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	6	PKGNAMESUFFIX= ${PYTHON_SUFFIX}




--- Modules/socketmodule.c
+++ Modules/socketmodule.c
@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
         /* RDS sockets use sockaddr_in: fall-through */
 #endif /* AF_RDS */
 
+#ifdef AF_DIVERT
+    case AF_DIVERT:
+        /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
+#endif /* AF_DIVERT */
+
     case AF_INET:
     {
         struct maybe_idna host = {NULL, NULL};
@@ -7628,6 +7633,14 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, AF_SYSTEM);
 #endif
 
+/* FreeBSD divert(4) */
+#ifdef PF_DIVERT
+    PyModule_AddIntMacro(m, PF_DIVERT);
+#endif
+#ifdef AF_DIVERT
+    PyModule_AddIntMacro(m, AF_DIVERT);
+#endif
+
 #ifdef AF_PACKET
     PyModule_AddIntMacro(m, AF_PACKET);
 #endif

Lines 1-5 Link Here

(-)b/lang/python38/Makefile (+1 lines)
1	PORTNAME= python	1	PORTNAME= python
2	DISTVERSION= ${PYTHON_DISTVERSION}	2	DISTVERSION= ${PYTHON_DISTVERSION}
		3	PORTREVISION= 1
3	CATEGORIES= lang python	4	CATEGORIES= lang python
4	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}	5	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
5	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	6	PKGNAMESUFFIX= ${PYTHON_SUFFIX}




--- Modules/socketmodule.c
+++ Modules/socketmodule.c
@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
         /* RDS sockets use sockaddr_in: fall-through */
 #endif /* AF_RDS */
 
+#ifdef AF_DIVERT
+    case AF_DIVERT:
+        /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
+#endif /* AF_DIVERT */
+
     case AF_INET:
     {
         struct maybe_idna host = {NULL, NULL};
@@ -7628,6 +7633,14 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, AF_SYSTEM);
 #endif
 
+/* FreeBSD divert(4) */
+#ifdef PF_DIVERT
+    PyModule_AddIntMacro(m, PF_DIVERT);
+#endif
+#ifdef AF_DIVERT
+    PyModule_AddIntMacro(m, AF_DIVERT);
+#endif
+
 #ifdef AF_PACKET
     PyModule_AddIntMacro(m, AF_PACKET);
 #endif

Lines 1-5 Link Here

(-)b/lang/python39/Makefile (+1 lines)
1	PORTNAME= python	1	PORTNAME= python
2	DISTVERSION= ${PYTHON_DISTVERSION}	2	DISTVERSION= ${PYTHON_DISTVERSION}
		3	PORTREVISION= 1
3	CATEGORIES= lang python	4	CATEGORIES= lang python
4	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}	5	MASTER_SITES= PYTHON/ftp/python/${DISTVERSION}
5	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	6	PKGNAMESUFFIX= ${PYTHON_SUFFIX}




--- Modules/socketmodule.c
+++ Modules/socketmodule.c
@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
         /* RDS sockets use sockaddr_in: fall-through */
 #endif /* AF_RDS */
 
+#ifdef AF_DIVERT
+    case AF_DIVERT:
+        /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
+#endif /* AF_DIVERT */
+
     case AF_INET:
     {
         struct maybe_idna host = {NULL, NULL};
@@ -7628,6 +7633,14 @@ PyInit__socket(void)
     PyModule_AddIntMacro(m, AF_SYSTEM);
 #endif
 
+/* FreeBSD divert(4) */
+#ifdef PF_DIVERT
+    PyModule_AddIntMacro(m, PF_DIVERT);
+#endif
+#ifdef AF_DIVERT
+    PyModule_AddIntMacro(m, AF_DIVERT);
+#endif
+
 #ifdef AF_PACKET
     PyModule_AddIntMacro(m, AF_PACKET);
 #endif

Return to bug 267648

Added Link Here

(-)b/lang/python310/files/patch-Modules__socketmodule.c (+29 lines)
1	--- Modules/socketmodule.c
2	+++ Modules/socketmodule.c
3	@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject s, PyObject args,
4	/* RDS sockets use sockaddr_in: fall-through */
5	#endif /* AF_RDS */
6
7	+#ifdef AF_DIVERT
8	+ case AF_DIVERT:
9	+ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
10	+#endif /* AF_DIVERT */
11	+
12	case AF_INET:
13	{
14	struct maybe_idna host = {NULL, NULL};
15	@@ -7628,6 +7633,14 @@ PyInit__socket(void)
16	PyModule_AddIntMacro(m, AF_SYSTEM);
17	#endif
18
19	+/* FreeBSD divert(4) */
20	+#ifdef PF_DIVERT
21	+ PyModule_AddIntMacro(m, PF_DIVERT);
22	+#endif
23	+#ifdef AF_DIVERT
24	+ PyModule_AddIntMacro(m, AF_DIVERT);
25	+#endif
26	+
27	#ifdef AF_PACKET
28	PyModule_AddIntMacro(m, AF_PACKET);
29	#endif

Added Link Here

(-)b/lang/python311/files/patch-Modules__socketmodule.c (+29 lines)
1	--- Modules/socketmodule.c
2	+++ Modules/socketmodule.c
3	@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject s, PyObject args,
4	/* RDS sockets use sockaddr_in: fall-through */
5	#endif /* AF_RDS */
6
7	+#ifdef AF_DIVERT
8	+ case AF_DIVERT:
9	+ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
10	+#endif /* AF_DIVERT */
11	+
12	case AF_INET:
13	{
14	struct maybe_idna host = {NULL, NULL};
15	@@ -7628,6 +7633,14 @@ PyInit__socket(void)
16	PyModule_AddIntMacro(m, AF_SYSTEM);
17	#endif
18
19	+/* FreeBSD divert(4) */
20	+#ifdef PF_DIVERT
21	+ PyModule_AddIntMacro(m, PF_DIVERT);
22	+#endif
23	+#ifdef AF_DIVERT
24	+ PyModule_AddIntMacro(m, AF_DIVERT);
25	+#endif
26	+
27	#ifdef AF_PACKET
28	PyModule_AddIntMacro(m, AF_PACKET);
29	#endif

Added Link Here

(-)b/lang/python37/files/patch-Modules__socketmodule.c (+29 lines)
1	--- Modules/socketmodule.c
2	+++ Modules/socketmodule.c
3	@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject s, PyObject args,
4	/* RDS sockets use sockaddr_in: fall-through */
5	#endif /* AF_RDS */
6
7	+#ifdef AF_DIVERT
8	+ case AF_DIVERT:
9	+ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
10	+#endif /* AF_DIVERT */
11	+
12	case AF_INET:
13	{
14	struct maybe_idna host = {NULL, NULL};
15	@@ -7628,6 +7633,14 @@ PyInit__socket(void)
16	PyModule_AddIntMacro(m, AF_SYSTEM);
17	#endif
18
19	+/* FreeBSD divert(4) */
20	+#ifdef PF_DIVERT
21	+ PyModule_AddIntMacro(m, PF_DIVERT);
22	+#endif
23	+#ifdef AF_DIVERT
24	+ PyModule_AddIntMacro(m, AF_DIVERT);
25	+#endif
26	+
27	#ifdef AF_PACKET
28	PyModule_AddIntMacro(m, AF_PACKET);
29	#endif

Added Link Here

(-)b/lang/python38/files/patch-Modules__socketmodule.c (+29 lines)
1	--- Modules/socketmodule.c
2	+++ Modules/socketmodule.c
3	@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject s, PyObject args,
4	/* RDS sockets use sockaddr_in: fall-through */
5	#endif /* AF_RDS */
6
7	+#ifdef AF_DIVERT
8	+ case AF_DIVERT:
9	+ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
10	+#endif /* AF_DIVERT */
11	+
12	case AF_INET:
13	{
14	struct maybe_idna host = {NULL, NULL};
15	@@ -7628,6 +7633,14 @@ PyInit__socket(void)
16	PyModule_AddIntMacro(m, AF_SYSTEM);
17	#endif
18
19	+/* FreeBSD divert(4) */
20	+#ifdef PF_DIVERT
21	+ PyModule_AddIntMacro(m, PF_DIVERT);
22	+#endif
23	+#ifdef AF_DIVERT
24	+ PyModule_AddIntMacro(m, AF_DIVERT);
25	+#endif
26	+
27	#ifdef AF_PACKET
28	PyModule_AddIntMacro(m, AF_PACKET);
29	#endif

Added Link Here

(-)b/lang/python39/files/patch-Modules__socketmodule.c (+29 lines)
1	--- Modules/socketmodule.c
2	+++ Modules/socketmodule.c
3	@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject s, PyObject args,
4	/* RDS sockets use sockaddr_in: fall-through */
5	#endif /* AF_RDS */
6
7	+#ifdef AF_DIVERT
8	+ case AF_DIVERT:
9	+ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */
10	+#endif /* AF_DIVERT */
11	+
12	case AF_INET:
13	{
14	struct maybe_idna host = {NULL, NULL};
15	@@ -7628,6 +7633,14 @@ PyInit__socket(void)
16	PyModule_AddIntMacro(m, AF_SYSTEM);
17	#endif
18
19	+/* FreeBSD divert(4) */
20	+#ifdef PF_DIVERT
21	+ PyModule_AddIntMacro(m, PF_DIVERT);
22	+#endif
23	+#ifdef AF_DIVERT
24	+ PyModule_AddIntMacro(m, AF_DIVERT);
25	+#endif
26	+
27	#ifdef AF_PACKET
28	PyModule_AddIntMacro(m, AF_PACKET);
29	#endif