[SCM] Image Reduction and Analysis Facility branch, debian, updated. 318861316c580a497f9476207ec7f0263d8d2f2b

Thu Jun 6 22:05:09 UTC 2013

The following commit has been merged in the debian branch:
commit fa7a378f1474a28e7bc6eb38aa3951cbd956a60c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jun 6 23:54:35 2013 +0200

    Restructure and comment the patches a bit

diff --git a/debian/patches/cflags.patch b/debian/patches/compiler-flags.patch
similarity index 88%
rename from debian/patches/cflags.patch
rename to debian/patches/compiler-flags.patch
index 6e14e1f..344f335 100644
--- a/debian/patches/cflags.patch
+++ b/debian/patches/compiler-flags.patch
@@ -1,5 +1,6 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Description: Propagate CFLAGS and CC to Makefiles.
+Description: Propagate compiler flags CFLAGS and CC to Makefiles.
+ This allows to use hardening flags in Debian.
 --- a/vendor/voclient/libsamp/libxrpc/Makefile
 +++ b/vendor/voclient/libsamp/libxrpc/Makefile
 @@ -26,7 +26,7 @@
@@ -50,10 +51,11 @@ Description: Propagate CFLAGS and CC to Makefiles.
  # list of source and include files
 --- a/vendor/voclient/libsamp/cfitsio/Makefile
 +++ b/vendor/voclient/libsamp/cfitsio/Makefile
-@@ -30,9 +30,9 @@
+@@ -29,10 +29,9 @@
+ 
  SHELL =		/bin/sh
  RANLIB =	ranlib
- CC =		gcc
+-CC =		gcc
 -CFLAGS =	-g -O2  -Dg77Fortran -fPIC -fno-common
 +CFLAGS :=	$(CFLAGS) -Dg77Fortran -fPIC -fno-common
  FC =		gfortran
@@ -249,32 +251,6 @@ Description: Propagate CFLAGS and CC to Makefiles.
  Shared:
  	/bin/mkdir $@
  	chmod 777 $@
---- a/unix/hlib/mkpkg.inc
-+++ b/unix/hlib/mkpkg.inc
-@@ -7,17 +7,17 @@
- $set	SITEID		= noao		# site name
- 
- $ifeq (MACH, freebsd) then
--$set	XFLAGS		= "-c -w -/m32"	# default XC compile flags
--$set	XVFLAGS		= "-c -w" -/m32	# VOPS XC compile flags
--$set	LFLAGS		= "-z -/static -/m32"	# default XC link flags
-+$set	XFLAGS		= "-c -w"	# default XC compile flags
-+$set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
-+$set	LFLAGS		= "-z -/static"	# default XC link flags
- $else $ifeq (MACH, linux) then
- $set	XFLAGS		= "-c -w"	# default XC compile flags
- $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
- $set	LFLAGS		= "-Nz"		# default XC link flags
- $else $ifeq (MACH, linux64) then
--$set	XFLAGS		= "-c -w -/g -/m64"	# default XC compile flags
--$set	XVFLAGS		= "-c -w -/g -/m64"	# VOPS XC compile flags
--$set	LFLAGS		= "-Nz   -/g -/m64"	# default XC link flags
-+$set	XFLAGS		= "-c -w"	# default XC compile flags
-+$set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
-+$set	LFLAGS		= "-Nz"		# default XC link flags
- $else $ifeq (MACH, redhat) then
- $set	XFLAGS		= "-c -w"	# default XC compile flags
- $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
 --- a/vendor/voclient/common/Makefile
 +++ b/vendor/voclient/common/Makefile
 @@ -17,7 +17,6 @@
@@ -387,3 +363,41 @@ Description: Propagate CFLAGS and CC to Makefiles.
  Shared:
  	/bin/mkdir $@
  	chmod 777 $@
+--- a/vendor/voclient/libsamp/libxrpc/mklibs
++++ b/vendor/voclient/libsamp/libxrpc/mklibs
+@@ -3,7 +3,6 @@
+ #set top = `(chdir .. ; pwd)`
+ set top = `pwd`
+ 
+-setenv CC 	"gcc"
+ setenv CXX 	"g++"
+ 
+ set	build_curl	= 0
+@@ -66,7 +65,6 @@
+ 
+ 
+ 
+-setenv CC 	"gcc -g -ggdb -O0"
+ setenv CXX 	"g++ -g -ggdb -O0"
+ 
+ if ($build_xmlrpc == 1) then
+--- a/vendor/voclient/libsamp/cfitsio/mklibs
++++ b/vendor/voclient/libsamp/cfitsio/mklibs
+@@ -3,7 +3,6 @@
+ #set top = `(chdir .. ; pwd)`
+ set top = `pwd`
+ 
+-setenv CC 	"gcc"
+ setenv CXX 	"g++"
+ 
+ 
+--- a/vendor/mklibs
++++ b/vendor/mklibs
+@@ -3,7 +3,6 @@
+ set p = `pwd`
+ set top = $p:h
+ 
+-setenv CC 	"gcc"
+ setenv CXX 	"g++"
+ 
+ set	build_cfitsio	= 1
diff --git a/debian/patches/remove-absolute-path.patch b/debian/patches/fhs.patch
similarity index 86%
rename from debian/patches/remove-absolute-path.patch
rename to debian/patches/fhs.patch
index 92f8942..d90cbfa 100644
--- a/debian/patches/remove-absolute-path.patch
+++ b/debian/patches/fhs.patch
@@ -1,17 +1,24 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Make the installation FHS conform.
+ This moves the IRAF installation from /iraf/iraf/ to /usr/share/iraf/, with
+ the system dependent files (binaries) in /usr/lib/iraf. Since the binaries
+ now cannot be found anymore under iraf$, we need to introduce a new variable
+ iraf_b$, which points to /usr/lib/iraf/.
+ .
+ Also, according to freedesktop.org, the user cache and data paths are moved
+ to their home directories.
 --- a/unix/hlib/cl.csh
 +++ b/unix/hlib/cl.csh
-@@ -33,9 +33,8 @@
-     endif
- endif
+@@ -35,7 +35,7 @@
+ 
  
--
  # Determine IRAF root directory (value set in install script).
 -set d_iraf = "/iraf/iraf/"
 +set d_iraf = "/usr/share/iraf/"
  if ($?iraf) then
      if (! -e $iraf) then
          echo "Warning: iraf=$iraf does not exist (check .cshrc or .login)"
-@@ -47,6 +46,8 @@
+@@ -47,6 +47,8 @@
      setenv iraf "$d_iraf"
  endif
  
@@ -20,7 +27,7 @@
  # Check for a version query.
  if ($#argv > 0) then
      if ("$argv[1]" == "-v" || "$argv[1]" == "-version" || \
-@@ -65,10 +66,10 @@
+@@ -65,10 +67,10 @@
  endif
  
  if ($?IRAFARCH) then
@@ -33,7 +40,7 @@
  	if ("$ACTUAL_ARCH" != "$IRAFARCH") then
              echo "ERROR:  IRAFARCH set to '$IRAFARCH', should be '$ACTUAL_ARCH'"
  	endif
-@@ -108,8 +109,8 @@
+@@ -108,8 +110,8 @@
          setenv IRAFARCH "$MACH"
      endif
  
@@ -44,7 +51,7 @@
  	exit 1
      endif
  endif
-@@ -132,7 +133,7 @@
+@@ -132,7 +134,7 @@
  	setenv arch ".$IRAFARCH"
      endif
  
@@ -53,7 +60,7 @@
      set file = ${IRAFBIN}$cl_binary
      if (-e $file) then
  	exec $file
-@@ -147,7 +148,7 @@
+@@ -147,7 +149,7 @@
  
  
  setenv arch 	.$IRAFARCH
diff --git a/debian/patches/fix_fncache.patch b/debian/patches/fix_fncache.patch
index eabb984..5fd5912 100644
--- a/debian/patches/fix_fncache.patch
+++ b/debian/patches/fix_fncache.patch
@@ -1,3 +1,5 @@
+Author: Joseph Wang <joequant at gmail.com>
+Description: Fix a nasty bug in fncache.
 --- a/unix/boot/mkpkg/fncache.c
 +++ b/unix/boot/mkpkg/fncache.c
 @@ -68,7 +68,7 @@
diff --git a/debian/patches/fortran.patch b/debian/patches/fortran.patch
index 40209c0..ce7d570 100644
--- a/debian/patches/fortran.patch
+++ b/debian/patches/fortran.patch
@@ -162,7 +162,7 @@ Description: Change Fortran arrays to use abstract pointers
        integer lenstr, i
        integer length
        lenstr = length (s)
-+      if (lenstr .eq. 0) then 
++      if (lenstr .eq. 0) then
 +         return
 +      endif
        if (.not.(s(1) .eq. 46 .and. s(lenstr) .eq. 46))goto 23000
diff --git a/debian/patches/libc.patch b/debian/patches/libc.patch
index be0d568..25aec67 100644
--- a/debian/patches/libc.patch
+++ b/debian/patches/libc.patch
@@ -47,22 +47,7 @@ Url: https://github.com/joequant/iraf/commit/bae72ee3b7ab1a05fbf5b7
  #ifndef D_iraf
  /* ### Start of run time definitions */
  #define	HOST		"/iraf/iraf/unix/"
-@@ -12,7 +14,7 @@
- #define	TMP		"/tmp/"
- /* ### End of run time definitions */
- 
--/* Compile time definitions (for C #ifdefs).
-+/* Compile time definitions 
-  */
- /* #define BSDUNIX */
- /* #define SUNOS4 */
-@@ -20,89 +22,90 @@
- #define D_iraf
- #endif
- 
--/* Include any header files specified in "#define import_XXX" statements
-+/* Include any header files specified in #define import_XXX statements
-  * before we were called.
+@@ -25,84 +27,85 @@
   */
  #ifdef import_libc
  #ifndef D_libc
@@ -750,15 +735,6 @@ Url: https://github.com/joequant/iraf/commit/bae72ee3b7ab1a05fbf5b7
 -#endif
 --- a/unix/hlib/libc/libc.h
 +++ b/unix/hlib/libc/libc.h
-@@ -42,7 +42,7 @@
- 
- /* External names.
-  */
--#ifndef NOLIBCNAMES
-+#ifndef NOLIBCNAMES*/
- 
- #define	getenv		envget
- #define	sys_nerr	u_sysnerr
 @@ -320,8 +320,9 @@
  
  /*
@@ -1083,14 +1059,6 @@ Url: https://github.com/joequant/iraf/commit/bae72ee3b7ab1a05fbf5b7
 +#define	D_stdio
 --- a/sys/libc/mkpkg
 +++ b/sys/libc/mkpkg
-@@ -1,6 +1,6 @@
- # Mkpkg for the IRAF runtime C library.  There is an additional dependence
- # on the global C include <iraf.h> which is not shown.  Those files which
--# reference <libc/stdio.h> have an implicit dependence on the VOS include
-+# reference <libc/iraf/stdio.h> have an implicit dependence on the VOS include
- # files <fio.h> and <fio.com>, since the LIBC stdio routines reference the
- # FIO internal data structures directly.
- 
 @@ -12,10 +12,10 @@
  libc.a:
  	$set	XFLAGS	= "$(XFLAGS) -/Wall"
diff --git a/debian/patches/series b/debian/patches/series
index 6ead842..462ea75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,15 +1,15 @@
-fix_fncache.patch
-fortran.patch
+mksys.patch
 irafuser_csh.patch
 libc.patch
-link_executables.patch
-mksys.patch
-shared-readline.patch
-unop_int.patch
+xc.patch
 voclient.patch
 vodata.patch
-xc.patch
+shared-readline.patch
 shared-xmlrpc.patch
-remove-absolute-path.patch
-cflags.patch
+fhs.patch
+link_executables.patch
+fix_fncache.patch
+fortran.patch
+unop_int.patch
+compiler-flags.patch
 fix_compiler_errors.patch
diff --git a/debian/patches/shared-readline.patch b/debian/patches/shared-readline.patch
index 49a9901..3a884a9 100644
--- a/debian/patches/shared-readline.patch
+++ b/debian/patches/shared-readline.patch
@@ -98,3 +98,14 @@
  	$else
  	$set	LIBS2 = ""
  	$endif
+--- a/vendor/voclient/common/mklibs
++++ b/vendor/voclient/common/mklibs
+@@ -7,7 +7,7 @@
+ setenv CC 	"gcc"
+ setenv CXX 	"g++"
+ 
+-set	build_curl	= 1
++set	build_curl	= 0
+ 
+ 
+ 
diff --git a/debian/patches/shared-xmlrpc.patch b/debian/patches/shared-xmlrpc.patch
index fb8a5c7..eda27a7 100644
--- a/debian/patches/shared-xmlrpc.patch
+++ b/debian/patches/shared-xmlrpc.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Use shared libxmlrpc, and wprkaround missing xmlrpc_refcount()
 --- a/vendor/voclient/libsamp/Makefile
 +++ b/vendor/voclient/libsamp/Makefile
 @@ -35,7 +35,7 @@
@@ -9,6 +11,17 @@
      CARCH       = -D$(PLATFORM)
  endif
  
+--- a/vendor/voclient/libsamp/libxrpc/mklibs
++++ b/vendor/voclient/libsamp/libxrpc/mklibs
+@@ -7,7 +7,7 @@
+ setenv CXX 	"g++"
+ 
+ set	build_curl	= 0
+-set	build_xmlrpc	= 1
++set	build_xmlrpc	= 0
+ 
+ 
+ 
 --- a/vendor/voclient/libsamp/libxrpc/xrClient.c
 +++ b/vendor/voclient/libsamp/libxrpc/xrClient.c
 @@ -857,8 +857,6 @@
diff --git a/debian/patches/voclient.patch b/debian/patches/voclient.patch
index f8cc24d..cf06080 100644
--- a/debian/patches/voclient.patch
+++ b/debian/patches/voclient.patch
@@ -201,15 +201,6 @@
  	touch .BASE
  
  lib: objs
-@@ -105,7 +108,7 @@
- ###############################################################################
- 
- votUtil_spp.o: votUtil_spp.x votParse_spp.h
--	xc -c votUtil_spp.x
-+	xc -c -w votUtil_spp.x
- 
- 
- ###############################################################################
 --- a/vendor/voclient/libvotable/votParse.c
 +++ b/vendor/voclient/libvotable/votParse.c
 @@ -18,7 +18,6 @@
@@ -240,28 +231,6 @@
  #include <curl/easy.h>
  
  #include "votParse.h"
---- a/vendor/voclient/common/mklibs
-+++ b/vendor/voclient/common/mklibs
-@@ -7,7 +7,7 @@
- setenv CC 	"gcc"
- setenv CXX 	"g++"
- 
--set	build_curl	= 1
-+set	build_curl	= 0
- 
- 
- 
---- a/vendor/voclient/libsamp/libxrpc/mklibs
-+++ b/vendor/voclient/libsamp/libxrpc/mklibs
-@@ -7,7 +7,7 @@
- setenv CXX 	"g++"
- 
- set	build_curl	= 0
--set	build_xmlrpc	= 1
-+set	build_xmlrpc	= 0
- 
- 
- 
 --- a/vendor/voclient/libsamp/libxrpc/Makefile
 +++ b/vendor/voclient/libsamp/libxrpc/Makefile
 @@ -50,7 +50,7 @@
diff --git a/debian/patches/xc.patch b/debian/patches/xc.patch
index 1a750f6..dac5cea 100644
--- a/debian/patches/xc.patch
+++ b/debian/patches/xc.patch
@@ -1,3 +1,5 @@
+Author: Joseph Wang <joequant at gmail.com>
+Description: Link xc to the needed shared libs, and adjust compile flags
 --- a/unix/boot/spp/xc.c
 +++ b/unix/boot/spp/xc.c
 @@ -67,7 +67,11 @@
@@ -51,3 +53,29 @@
  #ifdef SOLARIS
  	        else if (strcmp (lflag, "-ldl") == 0) {
  		    /* This beastie has to be linked dynamic on Solaris, but
+--- a/unix/hlib/mkpkg.inc
++++ b/unix/hlib/mkpkg.inc
+@@ -7,17 +7,17 @@
+ $set	SITEID		= noao		# site name
+ 
+ $ifeq (MACH, freebsd) then
+-$set	XFLAGS		= "-c -w -/m32"	# default XC compile flags
+-$set	XVFLAGS		= "-c -w" -/m32	# VOPS XC compile flags
+-$set	LFLAGS		= "-z -/static -/m32"	# default XC link flags
++$set	XFLAGS		= "-c -w"	# default XC compile flags
++$set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
++$set	LFLAGS		= "-z -/static"	# default XC link flags
+ $else $ifeq (MACH, linux) then
+ $set	XFLAGS		= "-c -w"	# default XC compile flags
+ $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
+ $set	LFLAGS		= "-Nz"		# default XC link flags
+ $else $ifeq (MACH, linux64) then
+-$set	XFLAGS		= "-c -w -/g -/m64"	# default XC compile flags
+-$set	XVFLAGS		= "-c -w -/g -/m64"	# VOPS XC compile flags
+-$set	LFLAGS		= "-Nz   -/g -/m64"	# default XC link flags
++$set	XFLAGS		= "-c -w"	# default XC compile flags
++$set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
++$set	LFLAGS		= "-Nz"		# default XC link flags
+ $else $ifeq (MACH, redhat) then
+ $set	XFLAGS		= "-c -w"	# default XC compile flags
+ $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags

-- 
Image Reduction and Analysis Facility

