Parcourir la source

Port the RSE patches to SVR4 safely this time.

Michael Schloh von Bennewitz il y a 23 ans
Parent
commit
386fa06b60
2 fichiers modifiés avec 19 ajouts et 2 suppressions
  1. 10 0
      cvs/cvs.patches.msvb
  2. 9 2
      cvs/cvs.spec

+ 10 - 0
cvs/cvs.patches.msvb

@@ -0,0 +1,10 @@
+--- src/server.c.orig	Wed Oct  2 15:37:29 2002
++++ src/server.c	Wed Oct  2 15:37:21 2002
+@@ -124,6 +124,7 @@
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <termio.h>
+ #include <netdb.h>
+ #endif
+ 

+ 9 - 2
cvs/cvs.spec

@@ -45,14 +45,15 @@ Distribution: OpenPKG [BASE]
 Group:        SCM
 License:      GPL
 Version:      %{V_cvs}
-Release:      20020919
+Release:      20021002
 
 #   list of sources
 Source0:      http://www.cvshome.org/files/19/10/cvs-%{V_cvs}.tar.gz
 Source1:      ftp://riemann.iam.uni-bonn.de/pub/users/roessler/cvslock/cvslock-%{V_cvslock}.tar.gz
 Source2:      http://www.red-bean.com/cvs2cl/cvs2cl.pl
 Source3:      cvs.patches.rse
-Source4:      rc.cvs
+Source4:      cvs.patches.msvb
+Source5:      rc.cvs
 Patch0:       cvs.patch
 
 #   build information
@@ -100,6 +101,12 @@ AutoReqProv:  no
       cat %{SOURCE cvs.patches.rse} |\
       sed -e 's;\(#define RSE_PATCH_CVSUSER_CALLER "\)cvs\("\);\1%{with_rse_patch_cvsuser_caller}\2;' |\
       %{l_patch} -p0
+      #   patch the patches to run on Solaris
+      case "%{l_target}" in
+          *-solaris* )
+          %{l_patch} -p0 < %{SOURCE cvs.patches.msvb}
+          ;;
+      esac
     )
 %endif