Skip to contentSkip to conversation

patch to bring Solaris back up to date

PATCH James Carlson 2 participants 3 messages Sep 21, 2024 – Oct 3, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

The attached patch for review brings the Solaris support back up to date. Here is a summary of the changes it contains:

- Updated readmes
- Disabled MPPE support for Solaris
- Fixed compilation error in ccp.c with MPPE disabled
- Use OS-provided drivers and associated include files
- Tested on OpenIndiana Hipster (Illumos)

Signature · 1 line
James Carlson     42.703N 71.076W FN42lq08    <[email protected]>
README +7 -1
index 5d25f3c..43c4555 100644
@@ -35,6 +35,12 @@ Linux distributions.  The Linux kernel code supports using PPP over
 things other than serial ports, such as PPP over Ethernet and PPP over
 ATM.
 
+Similarly, the kernel code for Solaris is no longer distributed with
+this package.  See the Illumos web site for pointers to the kernel
+module source code and build environment.
+
+  https://www.illumos.org/
+
 
 Installation.
 *************
@@ -172,7 +178,7 @@ to [email protected], or report them to the maintainer for the
 port for the operating system you are using:
 
 Linux			Paul Mackerras <[email protected]>
-Solaris			James Carlson <[email protected]>
+Solaris			James Carlson <[email protected]>
 
 
 Copyrights:
README.sol2 +48 -200

277 lines not on this page · raw message

configure.ac +1 -1
index 4b5e0fc..e30f161 100644
@@ -138,7 +138,7 @@ AM_CONDITIONAL(PPP_WITH_CHAPMS, test "x${enable_microsoft_extensions}" != "xno")
 AM_COND_IF([PPP_WITH_CHAPMS],
     AC_DEFINE([PPP_WITH_CHAPMS], 1, [Have Microsoft CHAP support]))
 
-AM_CONDITIONAL(PPP_WITH_MPPE, test "x${enable_microsoft_extensions}" != "xno")
+AM_CONDITIONAL(PPP_WITH_MPPE, test "x${build_sunos}" != "xyes" && test "x${enable_microsoft_extensions}" != "xno")
 AM_COND_IF([PPP_WITH_MPPE],
     AC_DEFINE([PPP_WITH_MPPE], 1, [Have Microsoft MPPE support]))
 
include/Makefile.am +1 -5
index 3777f8c..c92a9fa 100644
@@ -1,10 +1,6 @@
 EXTRA_HEADERS = \
     linux/ppp-comp.h \
-    linux/ppp_defs.h \
-    net/ppp-comp.h \
-    net/ppp_defs.h \
-    net/pppio.h \
-    net/vjcompress.h
+    linux/ppp_defs.h
 
 EXTRA_DIST = \
     $(EXTRA_HEADERS)
include/net/ppp-comp.h deleted +0 -179

179 lines not on this page · raw message

include/net/ppp_defs.h deleted +0 -186

186 lines not on this page · raw message

include/net/pppio.h deleted +0 -107

107 lines not on this page · raw message

include/net/vjcompress.h deleted +0 -144

144 lines not on this page · raw message

pppd/ccp.c +4 -1
index 3c28682..f0311b0 100644
@@ -685,7 +685,10 @@ static int
 	+ (go->deflate && go->deflate_draft? CILEN_DEFLATE: 0)
 	+ (go->predictor_1? CILEN_PREDICTOR_1: 0)
 	+ (go->predictor_2? CILEN_PREDICTOR_2: 0)
-	+ (go->mppe? CILEN_MPPE: 0);
+#ifdef PPP_WITH_MPPE
+	+ (go->mppe? CILEN_MPPE: 0)
+#endif
+        ;
 }
 
 /*
pppd/pppd-private.h +4 -0
index 561c541..a1db34d 100644
@@ -65,7 +65,11 @@
  * Where should PPP_DRV_NAME come from? Do we include it here?
  */
 #if !defined(PPP_DRV_NAME)
+#if defined(SOL2)
+#define PPP_DRV_NAME	"sppp"
+#else
 #define PPP_DRV_NAME	"ppp"
+#endif /* defined(SOL2) */
 #endif /* !defined(PPP_DRV_NAME) */
 
 
pppd/sys-solaris.c +9 -388

743 lines not on this page · raw message

#1 lore raw
Quoted 11 lines · James Carlson

The attached patch for review brings the Solaris support back up to date. Here is a summary of the changes it contains:

- Updated readmes
- Disabled MPPE support for Solaris
- Fixed compilation error in ccp.c with MPPE disabled
- Use OS-provided drivers and associated include files
- Tested on OpenIndiana Hipster (Illumos)

Signature · 1 line
James Carlson     42.703N 71.076W FN42lq08    <[email protected]>

Thanks James, and I apologize for my slow response.

Basically the patch looks good to me. I do need a Signed-off-by line from you, or at least your permission to add one like the one below for you. Let me know if you want me to add that for you and edit the description, or if you would prefer to resubmit it. In the former case I would edit the description to look like this:

------------------------------------------------------
Bring Solaris port back up to date

- Updated READMEs
- Disabled MPPE support for Solaris
- Fixed compilation error in ccp.c with MPPE disabled
- Use OS-provided drivers and associated include files
- Tested on OpenIndiana Hipster (Illumos)

------------------------------------------------------

Thanks,
Paul.

#2 lore raw
Quoted 9 lines · Paul Mackerras

Basically the patch looks good to me. I do need a Signed-off-by line from you, or at least your permission to add one like the one below for you. Let me know if you want me to add that for you and edit the description, or if you would prefer to resubmit it. In the former case I would edit the description to look like this:

------------------------------------------------------
Bring Solaris port back up to date

Quoted 8 lines

- Updated READMEs
- Disabled MPPE support for Solaris
- Fixed compilation error in ccp.c with MPPE disabled
- Use OS-provided drivers and associated include files
- Tested on OpenIndiana Hipster (Illumos)

------------------------------------------------------

That looks fine to me.

Signature · 1 line
James Carlson     42.703N 71.076W FN42lq08    <[email protected]>