From 1cd304f758531b92eda89f50edef6cd6b1e394ad Mon Sep 17 00:00:00 2001 From: pertusus Date: Jun 26 2008 20:00:16 +0000 Subject: - debian paw 2.14.04.dfsg.2-6 patcheset --- diff --git a/.cvsignore b/.cvsignore index eebd88c..c779029 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1,6 @@ cernlib_2006.dfsg.2-13.diff.gz 2006_src-free.tar.gz patchy.tar.gz -paw_2.14.04.dfsg.2-3.diff.gz +paw_2.14.04.dfsg.2-6.diff.gz mclibs_2006.dfsg.2-5.diff.gz geant321_3.21.14.dfsg-8.diff.gz diff --git a/307-use-canonical-cfortran.dpatch b/307-use-canonical-cfortran.dpatch index 325b138..3f553fa 100644 --- a/307-use-canonical-cfortran.dpatch +++ b/307-use-canonical-cfortran.dpatch @@ -3,12 +3,12 @@ ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Use the most recent version of cfortran.h and cfortran.doc from -## DP: Debian package of cfortran, version 4.4-6. +## DP: Debian package of cfortran, version 4.4-12. @DPATCH@ -diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc 1998-12-11 12:17:09.000000000 -0500 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc 2006-05-16 16:45:01.329802364 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/cfortran/cfortran.doc paw-2.14.04.dfsg.2/src/cfortran/cfortran.doc +--- paw-2.14.04.dfsg.2~/src/cfortran/cfortran.doc 1998-12-11 09:17:09.000000000 -0800 ++++ paw-2.14.04.dfsg.2/src/cfortran/cfortran.doc 2006-11-27 06:14:13.000000000 -0800 @@ -195,13 +195,13 @@ HP9000> f77 -c cfortex.f HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest @@ -90,16 +90,16 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.0 - YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE. - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA (E.G. TAPE, DISK, COMPUTER, PAPER.) -diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h ---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h 2002-09-11 13:05:51.000000000 -0400 -+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h 2006-05-16 16:44:47.680553957 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/cfortran/cfortran.h paw-2.14.04.dfsg.2/src/cfortran/cfortran.h +--- paw-2.14.04.dfsg.2~/src/cfortran/cfortran.h 2002-09-11 10:05:51.000000000 -0700 ++++ paw-2.14.04.dfsg.2/src/cfortran/cfortran.h 2008-05-14 09:07:05.000000000 -0700 @@ -1,4 +1,4 @@ -/* cfortran.h 4.4_cernlib2002 */ +/* cfortran.h 4.4 */ /* http://www-zeus.desy.de/~burow/cfortran/ */ /* Burkhard Burow burow@desy.de 1990 - 2002. */ -@@ -11,11 +11,71 @@ +@@ -11,11 +11,75 @@ MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE. */ @@ -139,6 +139,10 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. + Apr 2006: Modifications to support gfortran (and g77 with -fno-f2c flag) + since by default it returns "float" for FORTRAN REAL function. + (KMCCARTY) ++ May 2008: Revert commenting out of "extern" in COMMON_BLOCK_DEF macro. ++ Add braces around do-nothing ";" in 3 empty while blocks to ++ get rid of compiler warnings. Thanks to ROOT developers ++ Jacek Holeczek and Rene Brun for these suggestions. (KMCCARTY) + *******/ + /* @@ -172,7 +176,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. /* First prepare for the C compiler. */ -@@ -75,7 +135,9 @@ +@@ -75,7 +139,9 @@ /* Remainder of cfortran.h depends on the Fortran compiler. */ @@ -183,7 +187,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define f2cFortran #endif -@@ -90,6 +152,27 @@ +@@ -90,6 +156,27 @@ Support f2c or f77 with gcc, vcc with f2c. f77 with vcc works, missing link magic for f77 I/O.*/ #endif @@ -211,7 +215,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #if defined(__hpux) /* 921107: Use __hpux instead of __hp9000s300 */ #define hpuxFortran /* Should also allow hp9000s7/800 use.*/ #endif -@@ -131,6 +214,7 @@ +@@ -131,6 +218,7 @@ #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ @@ -219,7 +223,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \ - VAX VMS CC 3.1 and FORTRAN 5.4. \ -@@ -147,11 +231,14 @@ +@@ -147,11 +235,14 @@ - VAXUltrix: vcc,cc or gcc with f2c. gcc or cc with f77. \ - f77 with vcc works; but missing link magic for f77 I/O. \ - NO fort. None of gcc, cc or vcc generate required names.\ @@ -236,7 +240,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. /* Compiler must throw us out at this point! */ #endif #endif -@@ -164,7 +251,8 @@ +@@ -164,7 +255,8 @@ /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ @@ -246,17 +250,34 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else -@@ -268,7 +356,8 @@ +@@ -268,7 +360,7 @@ #endif #ifndef apolloFortran -#define COMMON_BLOCK_DEF(DEFINITION, NAME) DEFINITION NAME -+/* "extern" removed (CFITSIO) */ -+#define COMMON_BLOCK_DEF(DEFINITION, NAME) /* extern */ DEFINITION NAME ++#define COMMON_BLOCK_DEF(DEFINITION, NAME) extern DEFINITION NAME #define CF_NULL_PROTO #else /* HP doesn't understand #elif. */ /* Without ANSI prototyping, Apollo promotes float functions to double. */ -@@ -512,7 +601,7 @@ +@@ -453,7 +545,7 @@ + {char *e; + e = s + strlen(s); + if (e>s) { /* Need this to handle NULL string.*/ +- while (e>s && *--e==t); /* Don't follow t's past beginning. */ ++ while (e>s && *--e==t) {;} /* Don't follow t's past beginning. */ + e[*e==t?0:1] = '\0'; /* Handle s[0]=t correctly. */ + } return s; } + +@@ -469,7 +561,7 @@ + { + if (e==s) *e = '\0'; /* Kill the string makes sense here.*/ + else if (e>s) { /* Watch out for neg. length string.*/ +- while (e>s && *--e==t); /* Don't follow t's past beginning. */ ++ while (e>s && *--e==t){;} /* Don't follow t's past beginning. */ + e[*e==t?0:1] = '\0'; /* Handle s[0]=t correctly. */ + } return s; } + +@@ -512,7 +604,7 @@ *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO) ), \ (F).dsc$a_a0 = ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length ,(F)) @@ -265,7 +286,12 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define _NUM_ELEMS -1 #define _NUM_ELEM_ARG -2 #define NUM_ELEMS(A) A,_NUM_ELEMS -@@ -538,9 +627,14 @@ +@@ -534,13 +626,18 @@ + return term_char; + if (num_term <=0) num_term = (int)elem_len; + for (num=0; ; num++) { +- for (i=0; i<(unsigned)num_term && *strv==term_char; i++,strv++); ++ for (i=0; i<(unsigned)num_term && *strv==term_char; i++,strv++){;} if (i==(unsigned)num_term) break; else strv += elem_len-i; } @@ -281,7 +307,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. /*-------------------------------------------------------------------------*/ /* UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS */ -@@ -1318,6 +1412,7 @@ +@@ -1318,6 +1415,7 @@ #define INTVVVVVVV_cfTYPE int #define LOGICALVVVVVVV_cfTYPE int #define LONGVVVVVVV_cfTYPE long @@ -289,7 +315,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORTVVVVVVV_cfTYPE short #define PBYTE_cfTYPE INTEGER_BYTE #define PDOUBLE_cfTYPE DOUBLE_PRECISION -@@ -1325,6 +1420,7 @@ +@@ -1325,6 +1423,7 @@ #define PINT_cfTYPE int #define PLOGICAL_cfTYPE int #define PLONG_cfTYPE long @@ -297,7 +323,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define PSHORT_cfTYPE short #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A) -@@ -1342,6 +1438,7 @@ +@@ -1342,6 +1441,7 @@ #define INT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) #define LOGICAL_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) #define LONG_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) @@ -305,7 +331,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORT_cfINT(N,A,B,X,Y,Z) DOUBLE_cfINT(N,A,B,X,Y,Z) #define PBYTE_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) #define PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0) -@@ -1349,6 +1446,7 @@ +@@ -1349,6 +1449,7 @@ #define PINT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) #define PLOGICAL_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) #define PLONG_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) @@ -313,7 +339,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define PSHORT_cfINT(N,A,B,X,Y,Z) PDOUBLE_cfINT(N,A,B,X,Y,Z) #define BYTEV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) #define BYTEVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) -@@ -1392,6 +1490,13 @@ +@@ -1392,6 +1493,13 @@ #define LONGVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) #define LONGVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) #define LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) @@ -327,7 +353,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORTV_cfINT(N,A,B,X,Y,Z) DOUBLEV_cfINT(N,A,B,X,Y,Z) #define SHORTVV_cfINT(N,A,B,X,Y,Z) DOUBLEVV_cfINT(N,A,B,X,Y,Z) #define SHORTVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVV_cfINT(N,A,B,X,Y,Z) -@@ -1451,7 +1556,12 @@ +@@ -1451,7 +1559,12 @@ #define BYTE_cfPU(A) CFextern INTEGER_BYTE FCALLSC_QUALIFIER A #define DOUBLE_cfPU(A) CFextern DOUBLE_PRECISION FCALLSC_QUALIFIER A #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -340,7 +366,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #else #define FLOAT_cfPU(A) CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A #endif -@@ -1589,6 +1699,7 @@ +@@ -1589,6 +1702,7 @@ #define INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E) #define LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) @@ -348,7 +374,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) -@@ -1632,6 +1743,13 @@ +@@ -1632,6 +1746,13 @@ #define LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) @@ -362,7 +388,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) -@@ -1645,6 +1763,7 @@ +@@ -1645,6 +1766,7 @@ #define PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E) #define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) @@ -370,7 +396,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) #define STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E) #define PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E) -@@ -1957,6 +2076,7 @@ +@@ -1957,6 +2079,7 @@ #define INT_cfT(M,I,A,B,D) *A #define LOGICAL_cfT(M,I,A,B,D) F2CLOGICAL(*A) #define LONG_cfT(M,I,A,B,D) *A @@ -378,7 +404,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORT_cfT(M,I,A,B,D) *A #define BYTEV_cfT(M,I,A,B,D) A #define DOUBLEV_cfT(M,I,A,B,D) A -@@ -1964,6 +2084,7 @@ +@@ -1964,6 +2087,7 @@ #define INTV_cfT(M,I,A,B,D) A #define LOGICALV_cfT(M,I,A,B,D) A #define LONGV_cfT(M,I,A,B,D) A @@ -386,7 +412,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORTV_cfT(M,I,A,B,D) A #define BYTEVV_cfT(M,I,A,B,D) (void *)A /* We have to cast to void *,*/ #define BYTEVVV_cfT(M,I,A,B,D) (void *)A /* since we don't know the */ -@@ -2001,6 +2122,12 @@ +@@ -2001,6 +2125,12 @@ #define LONGVVVVV_cfT(M,I,A,B,D) (void *)A #define LONGVVVVVV_cfT(M,I,A,B,D) (void *)A #define LONGVVVVVVV_cfT(M,I,A,B,D) (void *)A @@ -399,7 +425,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORTVV_cfT(M,I,A,B,D) (void *)A #define SHORTVVV_cfT(M,I,A,B,D) (void *)A #define SHORTVVVV_cfT(M,I,A,B,D) (void *)A -@@ -2013,6 +2140,7 @@ +@@ -2013,6 +2143,7 @@ #define PINT_cfT(M,I,A,B,D) A #define PLOGICAL_cfT(M,I,A,B,D) ((*A=F2CLOGICAL(*A)),A) #define PLONG_cfT(M,I,A,B,D) A @@ -407,7 +433,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define PSHORT_cfT(M,I,A,B,D) A #define PVOID_cfT(M,I,A,B,D) A #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) -@@ -2083,12 +2211,18 @@ +@@ -2083,12 +2214,18 @@ #define INT_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( #define LOGICAL_cfFZ(UN,LN) int FCALLSC_QUALIFIER fcallsc(UN,LN)( #define LONG_cfFZ(UN,LN) long FCALLSC_QUALIFIER fcallsc(UN,LN)( @@ -427,7 +453,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #ifdef vmsFortran #define STRING_cfFZ(UN,LN) void FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS #else -@@ -2104,7 +2238,12 @@ +@@ -2104,7 +2241,12 @@ #endif #else #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT)) @@ -440,7 +466,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #else #define FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)( #endif -@@ -2118,13 +2257,19 @@ +@@ -2118,13 +2260,19 @@ #define BYTE_cfF(UN,LN) BYTE_cfFZ(UN,LN) #define DOUBLE_cfF(UN,LN) DOUBLE_cfFZ(UN,LN) #ifndef __CF_KnR @@ -460,7 +486,7 @@ diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09. #define SHORT_cfF(UN,LN) SHORT_cfFZ(UN,LN) #define VOID_cfF(UN,LN) VOID_cfFZ(UN,LN) #define STRING_cfF(UN,LN) STRING_cfFZ(UN,LN), -@@ -2187,6 +2332,7 @@ +@@ -2187,6 +2335,7 @@ #define LOGICAL_cfI return C2FLOGICAL(A0); #endif #define LONG_cfI return A0; diff --git a/cernlib.spec b/cernlib.spec index 44365da..37a340d 100644 --- a/cernlib.spec +++ b/cernlib.spec @@ -55,7 +55,7 @@ Name: %{?compat}cernlib%{?compiler} Version: 2006 -Release: 29%{?dist} +Release: 30%{?dist} Summary: General purpose CERN library Group: Development/Libraries # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL. @@ -139,7 +139,7 @@ Source204: cernlib-debian-copyright.in # debian patchsets Patch100001: http://ftp.de.debian.org/debian/pool/main/c/cernlib/cernlib_2006.dfsg.2-13.diff.gz -Patch100002: http://ftp.de.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-3.diff.gz +Patch100002: http://ftp.de.debian.org/debian/pool/main/p/paw/paw_2.14.04.dfsg.2-6.diff.gz Patch100003: http://ftp.de.debian.org/debian/pool/main/m/mclibs/mclibs_2006.dfsg.2-5.diff.gz Patch100004: http://ftp.de.debian.org/debian/pool/main/g/geant321/geant321_3.21.14.dfsg-8.diff.gz # change file to directory to DATADIR @@ -323,8 +323,6 @@ Patch1200: cernlib-script.patch Patch1201: cernlib-gxint-script.diff # modify the cernlib man page to fit with the distribution Patch1206: cernlib-man_static.patch -# modify the debian cernlib paw desktop file icon name -Patch1207: cernlib-fedora_desktop.patch # patchy 4 # not applied as it has allready been done by the sed one-liner in @@ -558,9 +556,6 @@ find paw-*dfsg* -type f -exec touch -r $timestamp {} \; find mclibs-*dfsg* -type f -exec touch -r $timestamp {} \; find geant321-*dfsg* -type f -exec touch -r $timestamp {} \; -%patch -P 1207 -p1 -b .fedora_desktop -touch -r paw-*dfsg*/debian/add-ons/misc/paw++.desktop.fedora_desktop paw-*dfsg*/debian/add-ons/misc/paw++.desktop - cp -p cernlib-2006.dfsg.2/debian/add-ons/bin/cernlib.in . cd %{version} @@ -1440,6 +1435,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %endif %changelog +* Thu Jun 26 2008 Patrice Dumas 2006-30 +- debian paw 2.14.04.dfsg.2-6 patcheset + * Sat Apr 5 2008 Patrice Dumas 2006-29 - debian cernlib 2006.dfsg.2-13 patchset diff --git a/paw-804-workaround-for-comis-mdpool-struct-location.dpatch b/paw-804-workaround-for-comis-mdpool-struct-location.dpatch index a1ea0a8..3e10b1c 100644 --- a/paw-804-workaround-for-comis-mdpool-struct-location.dpatch +++ b/paw-804-workaround-for-comis-mdpool-struct-location.dpatch @@ -7,9 +7,9 @@ ## DP: libraries on some arches). @DPATCH@ -diff -urNad cernlib-2005.05.09/src/cfortran/Examples/pamain.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c ---- cernlib-2005.05.09/src/cfortran/Examples/pamain.c 2002-09-12 12:05:18.000000000 -0400 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/cfortran/Examples/pamain.c 2005-06-11 09:59:51.875449396 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/cfortran/Examples/pamain.c paw-2.14.04.dfsg.2/src/cfortran/Examples/pamain.c +--- paw-2.14.04.dfsg.2~/src/cfortran/Examples/pamain.c 2002-09-12 09:05:18.000000000 -0700 ++++ paw-2.14.04.dfsg.2/src/cfortran/Examples/pamain.c 2008-06-25 20:22:43.000000000 -0700 @@ -2,6 +2,7 @@ #include #include @@ -18,9 +18,22 @@ diff -urNad cernlib-2005.05.09/src/cfortran/Examples/pamain.c /tmp/dpep.nHIc6F/c #define PAWC_SIZE 9000000 -diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc ---- cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc 2000-05-30 09:53:58.000000000 -0400 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc 2005-06-11 09:59:51.876449180 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/paw_motif/paw/pawsiz.inc paw-2.14.04.dfsg.2/src/paw_motif/paw/pawsiz.inc +--- paw-2.14.04.dfsg.2~/src/paw_motif/paw/pawsiz.inc 1996-03-01 08:50:06.000000000 -0800 ++++ paw-2.14.04.dfsg.2/src/paw_motif/paw/pawsiz.inc 2008-06-25 20:22:43.000000000 -0700 +@@ -28,5 +28,9 @@ + #include "paw/pawsmall.inc" + #endif + ++C Include this file so that MDPOOL/IQ is present in pawX11 and ++C paw++ dynamically linked executables. ++C -- Kevin McCarty, for Debian, 1 Nov 2003 ++#include "comis/mdpool.inc" + + #endif +diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/cspar.inc paw-2.14.04.dfsg.2/src/pawlib/comis/comis/cspar.inc +--- paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/cspar.inc 2000-05-30 06:53:58.000000000 -0700 ++++ paw-2.14.04.dfsg.2/src/pawlib/comis/comis/cspar.inc 2008-06-25 20:22:43.000000000 -0700 @@ -15,7 +15,9 @@ * * cspar.inc @@ -32,9 +45,9 @@ diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/cspar.inc /tmp/dpep.nHIc6F +, KON3=2**16, LRECU=8,NRECU=5,MLRECU=NRECU*LRECU +, MXRECU=MLRECU-LRECU 1, LASTK=2000,LSSTK=50,KLENID=32 -diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h ---- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h 1969-12-31 19:00:00.000000000 -0500 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h 2004-06-30 21:54:11.000000000 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/mdpool.h paw-2.14.04.dfsg.2/src/pawlib/comis/comis/mdpool.h +--- paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/mdpool.h 1969-12-31 16:00:00.000000000 -0800 ++++ paw-2.14.04.dfsg.2/src/pawlib/comis/comis/mdpool.h 2008-06-25 20:22:43.000000000 -0700 @@ -0,0 +1,33 @@ +#ifndef _MDPOOL_H +#define _MDPOOL_H @@ -69,9 +82,9 @@ diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.h /tmp/dpep.nHIc6F/ +#endif + +#endif /* _MDPOOL_H */ -diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc ---- cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc 1996-02-26 12:16:34.000000000 -0500 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc 2005-06-11 09:59:51.876449180 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/mdpool.inc paw-2.14.04.dfsg.2/src/pawlib/comis/comis/mdpool.inc +--- paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/mdpool.inc 1996-02-26 09:16:34.000000000 -0800 ++++ paw-2.14.04.dfsg.2/src/pawlib/comis/comis/mdpool.inc 2008-06-25 20:22:43.000000000 -0700 @@ -12,6 +12,8 @@ * * mdpool.inc @@ -81,9 +94,9 @@ diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdpool.inc /tmp/dpep.nHIc6 COMMON/MDPOOL/IQ(LHP) INTEGER ISEM(LHP),KD(LHP),IDA(LHP),KD1(99),KD2(99),KD3(99) EQUIVALENCE (IQ,ISEM),(IQ,KD),(IQ,IDA) -diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h ---- cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h 1969-12-31 19:00:00.000000000 -0500 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h 2004-06-30 21:54:11.000000000 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/mdsize.h paw-2.14.04.dfsg.2/src/pawlib/comis/comis/mdsize.h +--- paw-2.14.04.dfsg.2~/src/pawlib/comis/comis/mdsize.h 1969-12-31 16:00:00.000000000 -0800 ++++ paw-2.14.04.dfsg.2/src/pawlib/comis/comis/mdsize.h 2008-06-25 20:22:43.000000000 -0700 @@ -0,0 +1,6 @@ +#ifndef _MDSIZE_H +#define _MDSIZE_H @@ -91,15 +104,16 @@ diff -urNad cernlib-2005.05.09/src/pawlib/comis/comis/mdsize.h /tmp/dpep.nHIc6F/ +#define MDSIZE 50006 + +#endif -diff -urNad cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c ---- cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c 1999-11-15 08:36:24.000000000 -0500 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c 2005-06-11 09:59:51.875449396 -0400 -@@ -39,21 +39,20 @@ +diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/csallo.c paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/csallo.c +--- paw-2.14.04.dfsg.2~/src/pawlib/comis/deccc/csallo.c 1999-11-15 05:36:24.000000000 -0800 ++++ paw-2.14.04.dfsg.2/src/pawlib/comis/deccc/csallo.c 2008-06-25 20:29:44.000000000 -0700 +@@ -39,20 +39,20 @@ /*-- Author :*/ #include +#include +#include ++#include +#include "comis/mdsize.h" typedef struct { @@ -108,27 +122,26 @@ diff -urNad cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c /tmp/dpep.nHIc6F/ } mdpool_def; #define MDPOOL COMMON_BLOCK(MDPOOL,mdpool) --COMMON_BLOCK_DEF(mdpool_def,MDPOOL); -+extern COMMON_BLOCK_DEF(mdpool_def,MDPOOL); + COMMON_BLOCK_DEF(mdpool_def,MDPOOL); -unsigned long iqpntr = (unsigned long)MDPOOL.iq; +- +unsigned long iqpntr = 0; - -#ifdef CERNLIB_WINNT -# include -#endif -- + #if defined(CERNLIB_QX_SC) int type_of_call csallo_(lenb) - #endif -@@ -65,11 +64,31 @@ +@@ -65,11 +65,38 @@ #endif int *lenb; { - long lpntr; +- int pntr; + unsigned long lpntr; - int pntr; ++ unsigned int pntr; + if (! iqpntr) + iqpntr = (unsigned long)MDPOOL.iq; @@ -140,38 +153,32 @@ diff -urNad cernlib-2005.05.09/src/pawlib/comis/deccc/csallo.c /tmp/dpep.nHIc6F/ + exit(EXIT_FAILURE); + } + -+ pntr = (long)lpntr - (long)iqpntr; -+ if (pntr < 0) { ++ if (lpntr < iqpntr) { + fprintf(stderr, "CSALLO: heap below bss?!"); +#if defined (CERNLIB_DEBIAN) + fprintf(stderr, "\n" +"See the file /usr/share/doc/libpawlib2-dev/README.Debian for more information.\n" +"If it does not help to solve this problem, please file a bug report against\n" -+"the libpawlib2 package, including the source code of your executable.\n"); ++"the libpawlib2-dev package, including the source code of your executable.\n"); +#else + fprintf(stderr, " Try linking against pawlib statically.\n"); +#endif + exit(EXIT_FAILURE); + } ++ else if (lpntr - iqpntr > UINT_MAX) { ++ fprintf(stderr, ++ "CSALLO: pointer difference too large to be represented by integer.\n" ++ "You probably need to link PAW statically on 64-bit systems.\n"); ++ exit(EXIT_FAILURE); ++ } ++ ++ pntr = lpntr - iqpntr; return pntr; } -diff -urNad cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc ---- cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc 1996-03-01 11:50:06.000000000 -0500 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/pawlib/paw/paw/pawsiz.inc 2005-06-11 09:59:51.875449396 -0400 -@@ -28,5 +28,9 @@ - #include "paw/pawsmall.inc" - #endif - -+C Include this file so that MDPOOL/IQ is present in pawX11 and -+C paw++ dynamically linked executables. -+C -- Kevin McCarty, for Debian, 1 Nov 2003 -+#include "comis/mdpool.inc" - - #endif -diff -urNad cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc ---- cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc 1996-03-01 11:50:06.000000000 -0500 -+++ /tmp/dpep.nHIc6F/cernlib-2005.05.09/src/paw_motif/paw/pawsiz.inc 2005-06-11 09:59:51.875449396 -0400 +diff -urNad paw-2.14.04.dfsg.2~/src/pawlib/paw/paw/pawsiz.inc paw-2.14.04.dfsg.2/src/pawlib/paw/paw/pawsiz.inc +--- paw-2.14.04.dfsg.2~/src/pawlib/paw/paw/pawsiz.inc 1996-03-01 08:50:06.000000000 -0800 ++++ paw-2.14.04.dfsg.2/src/pawlib/paw/paw/pawsiz.inc 2008-06-25 20:22:43.000000000 -0700 @@ -28,5 +28,9 @@ #include "paw/pawsmall.inc" #endif diff --git a/sources b/sources index 67c7c59..236afb9 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ afc3aa5c80b4f876f48bc888a570d511 cernlib_2006.dfsg.2-13.diff.gz fe71a3f6b95ff2151c5a4690116a0358 2006_src-free.tar.gz b1f550eedc545a02f0ab58eb7d550480 patchy.tar.gz -d8e01253d4cd737d63962003b612326c paw_2.14.04.dfsg.2-3.diff.gz +27c7f5b112bfb80f4a9acc8964c4e9c1 paw_2.14.04.dfsg.2-6.diff.gz c65e057e938076f73645a193d497aaf4 mclibs_2006.dfsg.2-5.diff.gz c73b0d68cd39bce7d2d84fe6be6cd14d geant321_3.21.14.dfsg-8.diff.gz