[SCM] CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences branch, master, updated. upstream/2006.dfsg.2-47-g2c774a1

Lifeng Sun lifongsun at gmail.com
Thu Jul 5 12:31:19 UTC 2012 

The following commit has been merged in the master branch:
commit 2c774a193f4c632a6e930e380358181f7cc40ba3
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jul 5 18:13:57 2012 +0800

    Revise patchset.

diff --git a/debian/patches/134-fix-typo-authentification-authentication.dpatch b/debian/patches/134-fix-typo-authentification-authentication.dpatch
old mode 100755
new mode 100644
index 617715c..b43f84f
--- a/debian/patches/134-fix-typo-authentification-authentication.dpatch
+++ b/debian/patches/134-fix-typo-authentification-authentication.dpatch
@@ -5,11 +5,9 @@
 ## DP: Fix typo: authentification -> authentication.
 
 @DPATCH@
-diff --git a/src/packlib/cspack/programs/zftp/zftpcdf.cdf b/src/packlib/cspack/programs/zftp/zftpcdf.cdf
-index 9614bd1..1ee59da 100644
 --- a/src/packlib/cspack/programs/zftp/zftpcdf.cdf
 +++ b/src/packlib/cspack/programs/zftp/zftpcdf.cdf
-@@ -459,7 +459,7 @@ table or in the names server.
+@@ -460,7 +460,7 @@
  .
  The machine name may be given as a character string,
  e.g. VXCRNA, or as an internet address, e.g. 128.141.1.100
diff --git a/debian/patches/202-fix-includes-in-minuit-example.dpatch b/debian/patches/202-fix-includes-in-minuit-example.dpatch
old mode 100755
new mode 100644
index ec0ad32..0efdd5b
--- a/debian/patches/202-fix-includes-in-minuit-example.dpatch
+++ b/debian/patches/202-fix-includes-in-minuit-example.dpatch
@@ -5,10 +5,9 @@
 ## DP: minuit-main example should have <> instead of "" around include files.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c /tmp/dpep.SuauEf/cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c
---- cernlib-2005.05.09~/src/cfortran/Examples/minuit-main.c	2001-04-18 04:56:22.000000000 -0400
-+++ cernlib-2005.05.09/src/cfortran/Examples/minuit-main.c	2005-06-09 13:22:59.567224997 -0400
-@@ -15,8 +15,8 @@
+--- a/src/cfortran/Examples/minuit-main.c
++++ b/src/cfortran/Examples/minuit-main.c
+@@ -8,8 +8,8 @@
   *          Gunter Folger <Gunter.Folger at cern.ch>
   */
  
diff --git a/debian/patches/218-support-kfreebsd.dpatch b/debian/patches/218-support-kfreebsd.dpatch
old mode 100755
new mode 100644
index 31ab17e..e1690eb
--- a/debian/patches/218-support-kfreebsd.dpatch
+++ b/debian/patches/218-support-kfreebsd.dpatch
@@ -4,8 +4,6 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 
 @DPATCH@
-diff --git a/src/packlib/kuip/code_motif/kmfile.c b/src/packlib/kuip/code_motif/kmfile.c
-index 401b177..d887576 100644
 --- a/src/packlib/kuip/code_motif/kmfile.c
 +++ b/src/packlib/kuip/code_motif/kmfile.c
 @@ -23,6 +23,9 @@
@@ -18,11 +16,9 @@ index 401b177..d887576 100644
  
  static char **ftype_list = NULL;
  static char **class_list = NULL;
-diff --git a/src/packlib/kernlib/kernbit/z268/systems.c b/src/packlib/kernlib/kernbit/z268/systems.c
-index 24af735..17a2a63 100644
 --- a/src/packlib/kernlib/kernbit/z268/systems.c
 +++ b/src/packlib/kernlib/kernbit/z268/systems.c
-@@ -203,7 +203,8 @@ int     *ovflw;
+@@ -203,7 +203,8 @@
  || defined(_IBMR2) \
  || defined(__convexc__) \
  || defined(_OSK) \
@@ -32,11 +28,9 @@ index 24af735..17a2a63 100644
  
    void systems_( command, buf, buflen, l, chars, rc, ovflw )
  
-diff --git a/src/packlib/cspack/sysreq/log.c b/src/packlib/cspack/sysreq/log.c
-index 2dac5d2..ff7a31c 100644
 --- a/src/packlib/cspack/sysreq/log.c
 +++ b/src/packlib/cspack/sysreq/log.c
-@@ -84,7 +84,8 @@ syslog() {
+@@ -84,7 +84,8 @@
  static int pid;                 /* process identifier                   */
  static int logfd ;              /* logging file descriptor              */
  #if !defined(SOLARIS) && !defined(linux) && !defined(_AIX) \
@@ -46,11 +40,9 @@ index 2dac5d2..ff7a31c 100644
  extern int syslog();
  #endif /* !SOLARIS && !IRIX5 && !apollo && !linux && !AIX */
  extern char *getenv();
-diff --git a/src/packlib/cspack/tcpaw/tcpaw.c b/src/packlib/cspack/tcpaw/tcpaw.c
-index cd03aad..521dc3e 100644
 --- a/src/packlib/cspack/tcpaw/tcpaw.c
 +++ b/src/packlib/cspack/tcpaw/tcpaw.c
-@@ -2590,6 +2590,11 @@ token()
+@@ -2562,6 +2562,11 @@
          return (ID);
  }
   
@@ -62,7 +54,7 @@ index cd03aad..521dc3e 100644
  #if !defined(IBM) && !defined(_WIN32)
  /* I provide "getpass" myself as standard version truncates to 8 characters */
  #include <sys/ioctl.h>
-@@ -2697,7 +2702,7 @@ rexec(ahost, rport, name, pass, cmd, fd2p)
+@@ -2669,7 +2674,7 @@
   
          char **ahost;
          int rport;
diff --git a/debian/patches/300-skip-duplicate-lenocc.dpatch b/debian/patches/300-skip-duplicate-lenocc.dpatch
old mode 100755
new mode 100644
index 59e148a..75c7827
--- a/debian/patches/300-skip-duplicate-lenocc.dpatch
+++ b/debian/patches/300-skip-duplicate-lenocc.dpatch
@@ -5,10 +5,9 @@
 ## DP: Only compile one of the two "lenocc()" functions.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile
---- cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile	2002-09-19 16:44:52.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/packlib/kernlib/kerngen/ccgen/Imakefile	2005-11-28 19:59:28.690293288 +0000
-@@ -19,7 +19,9 @@
+--- a/src/packlib/kernlib/kerngen/ccgen/Imakefile
++++ b/src/packlib/kernlib/kerngen/ccgen/Imakefile
+@@ -23,7 +23,9 @@
  SRCS_C += apofsz.c
  #endif
  
@@ -19,7 +18,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kernlib/kerngen/ccgen/Imakefile
  SRCS_C += lnblnk.c
  #endif
  
-@@ -29,7 +31,7 @@
+@@ -33,7 +35,7 @@
  
  #if defined(CERNLIB_DECS) || defined(CERNLIB_QMVAOS) \
   || defined(CERNLIB_HPUX) || defined(CERNLIB_IBMRT) || defined(CERNLIB_IBMRTD) \
diff --git a/debian/patches/303-shadow-passwords-supported.dpatch b/debian/patches/303-shadow-passwords-supported.dpatch
old mode 100755
new mode 100644
index a243bf9..c4533f6
--- a/debian/patches/303-shadow-passwords-supported.dpatch
+++ b/debian/patches/303-shadow-passwords-supported.dpatch
@@ -5,10 +5,9 @@
 ## DP: Allow CERN's server code to read from /etc/shadow.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI/cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c
---- cernlib-2005.05.09~/src/packlib/cspack/tcpaw/tcpaw.c	2005-04-18 11:39:28.000000000 -0400
-+++ cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c	2005-06-08 16:55:00.088372396 -0400
-@@ -28,6 +28,9 @@
+--- a/src/packlib/cspack/tcpaw/tcpaw.c
++++ b/src/packlib/cspack/tcpaw/tcpaw.c
+@@ -34,6 +34,9 @@
   *
   */
  #include "cspack/pilot.h"
@@ -18,7 +17,7 @@ diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI
  #if !defined(CERNLIB_IBM)||defined(CERNLIB_TCPSOCK)
  /*N.B. Must define sequence TCPLOG if a log file is required, e.g.*/
  /*#define LOGFILE "disk$dd:-ben.socks-serv.log"*/ /* VMS    */
-@@ -231,7 +234,7 @@
+@@ -237,7 +240,7 @@
  #endif /* OSK */
  #endif /* AUTHENT */
   
@@ -27,7 +26,7 @@ diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI
  #include <shadow.h>
  #endif /* linux_softland */
   
-@@ -1780,10 +1783,10 @@
+@@ -1790,10 +1793,10 @@
          union wait ret;
  #endif /* APOPWD1 */
   
@@ -40,7 +39,7 @@ diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI
          struct spwd *spwd;
  #endif /* linux_softland */
   
-@@ -1798,6 +1801,7 @@
+@@ -1808,6 +1811,7 @@
                  reply("Unknown user %s.\n", user);
                  return(-2);
          }
@@ -48,7 +47,7 @@ diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI
   
  #ifdef linux_softland
          spwd = getspnam(user);
-@@ -1805,6 +1809,29 @@
+@@ -1815,6 +1819,29 @@
                  reply("User %s has illegal shadow password\n",user);
                  return(-2);
          }
@@ -78,7 +77,7 @@ diff -urNad cernlib-2005.05.09/src/packlib/cspack/tcpaw/tcpaw.c /tmp/dpep.KyLyTI
  #endif /* linux_softland */
   
  #ifdef APOPWD1
-@@ -1850,15 +1877,16 @@
+@@ -1860,15 +1887,16 @@
  #else
   
  #ifdef linux_softland
diff --git a/debian/patches/320-support-ifort.dpatch b/debian/patches/320-support-ifort.dpatch
old mode 100755
new mode 100644
index ab6641f..3b5d406
--- a/debian/patches/320-support-ifort.dpatch
+++ b/debian/patches/320-support-ifort.dpatch
@@ -5,10 +5,9 @@
 ## DP: Support compilation with Intel's ifort compiler.
 
 @DPATCH@
-diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg/src/config/linux.cf
---- cernlib-2005.05.09.dfsg~/src/config/linux.cf	2006-07-05 14:40:47.890234094 -0400
-+++ cernlib-2005.05.09.dfsg/src/config/linux.cf	2006-07-05 14:41:49.656893427 -0400
-@@ -446,8 +446,8 @@
+--- a/src/config/linux.cf
++++ b/src/config/linux.cf
+@@ -455,8 +455,8 @@
  #  define OptimisedFortranFlags  -O -mp1 -fp_port
  #  define NoOpFortranDebugFlags  -O0
  #  define DefaultFCOptions       
@@ -19,9 +18,8 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/config/linux.cf cernlib-2005.05.09.dfsg
  #else
  
  # ifdef HasIntelefc
-diff -urNad cernlib-2005.05.09.dfsg~/src/packlib/kuip/programs/kxterm/Imakefile cernlib-2005.05.09.dfsg/src/packlib/kuip/programs/kxterm/Imakefile
---- cernlib-2005.05.09.dfsg~/src/packlib/kuip/programs/kxterm/Imakefile	2006-07-05 14:40:47.633289557 -0400
-+++ cernlib-2005.05.09.dfsg/src/packlib/kuip/programs/kxterm/Imakefile	2006-07-05 14:42:42.088557013 -0400
+--- a/src/packlib/kuip/programs/kxterm/Imakefile
++++ b/src/packlib/kuip/programs/kxterm/Imakefile
 @@ -14,6 +14,9 @@
  
  #if defined(CERNLIB_UNIX)

-- 
CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences

More information about the debian-science-commits mailing list