Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv11543
Modified Files: cernlib2006.info Added Files: cernlib2006.patch Log Message: Provide a wrapper for paw which disables the ASLR. Remove conflicts/replaces for non-existant versions. --- NEW FILE: cernlib2006.patch --- --- src.orig/pawlib/paw/programs/Imakefile 2006-09-04 14:33:00.000000000 +0200 +++ src.new/pawlib/paw/programs/Imakefile 2011-09-01 10:56:05.000000000 +0200 @@ -51,6 +51,8 @@ #endif +CernlibCcProgramTarget(disableASLR,disableASLR.o,NullParameter,disableASLR.o,NullParameter) +InstallProgram(disableASLR,$(CERN_BINDIR)) #ifdef CERNLIB_VAXVMS NeedTcpipLib --- src.orig/pawlib/paw/programs/disableASLR.c 1970-01-01 01:00:00.000000000 +0100 +++ src.new/pawlib/paw/programs/disableASLR.c 2011-09-01 10:09:13.000000000 +0200 @@ -0,0 +1,47 @@ +#include <stdio.h> +#include <stdlib.h> +#include <sys/types.h> +#include <unistd.h> +#include <spawn.h> +#include <sys/wait.h> + +#ifndef _POSIX_SPAWN_DISABLE_ASLR +#define _POSIX_SPAWN_DISABLE_ASLR 0x0100 +#endif + +int +main(int argc, char* argv[], char* env[]) +{ + pid_t pid; + int err; + posix_spawnattr_t attr; + + if ( argc == 0 ) + { + printf("Please specify the full path to an executable.\n"); + exit(1); + } + + if ( posix_spawnattr_init(&attr) ) + { + perror("Couldn't initialize attributes for posix_spawn"); + exit(1); + } + + if ( posix_spawnattr_setflags(&attr, _POSIX_SPAWN_DISABLE_ASLR) ) + { + perror("Couldn't add _POSIX_SPAWN_DISABLE_ASLR to attributes"); + exit(1); + } + + if( posix_spawn(&pid, argv[1], NULL, &attr, argv, env) ) + { + perror("posix_spawn failed"); + exit(1); + } + + /* Wait for the spawned process to exit */ + (void)wait(NULL); + + return 0; +} --- src.orig/scripts/paw 1996-04-25 11:50:57.000000000 +0200 +++ src.new/scripts/paw 2011-09-01 10:57:42.000000000 +0200 @@ -56,5 +56,5 @@ echo " Calling $ver version of paw-$drv" echo fi - $GDIR/paw$drv $* + $GDIR/disableASLR $GDIR/paw$drv $* [ ! -s paw.metafile ] && rm paw.metafile Index: cernlib2006.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/cernlib2006.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cernlib2006.info 3 Aug 2011 15:40:15 -0000 1.2 +++ cernlib2006.info 1 Sep 2011 13:02:41 -0000 1.3 @@ -1,7 +1,7 @@ Info3: << Package: cernlib2006 Version: 2006b -Revision: 13 +Revision: 14 Description: Paw and other basic executables Depends: x11 BuildDepends: << @@ -12,22 +12,6 @@ gcc46, patchy4-gfortran << -Conflicts: << - cernlib2002, - cernlib2003, - cernlib (<= 2003-22), - cernlib2005, - cernlib2005-g77, - cernlib2005-gfortran -<< -Replaces: << - cernlib2002, - cernlib2003, - cernlib (<= 2003-22), - cernlib2005, - cernlib2005-g77, - cernlib2005-gfortran -<< Provides: cernlib CustomMirror: << Primary: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/ @@ -36,8 +20,10 @@ SourceRename: cernlib-%v.tar.gz Source-MD5: 750c4804a2366ccd8e80c45a055f8ac5 Source2: http://cern.ch/~mommsen/fink/%f.patch.gz -Source2-MD5: 3de9dfcb6ae2dd0a772dbf140b2cfc88 +Source2-MD5: d91ac6aae72c953ba9aa1ac165f7bc24 SourceDirectory: 2006/src +PatchFile: %n.patch +PatchFile-MD5: 9e4f752585d5a9c86fe6acdd41fe0a77 PatchScript: << #!/bin/sh -ev case "%m" in @@ -49,6 +35,7 @@ s|@PREFIX@|%p|g ; s|@ARCH@|${ARCH}|g }" | patch -p1 + %{default_script} << CompileScript: << #!/bin/sh -ev @@ -84,6 +71,7 @@ install -m 755 cernlib/%v/bin/cdmove %i/bin install -m 755 cernlib/%v/bin/cdserv %i/bin install -m 755 cernlib/%v/bin/cernlib %i/bin + install -m 755 cernlib/%v/bin/disableASLR %i/bin install -m 755 cernlib/%v/bin/dzedit %i/bin install -m 755 cernlib/%v/bin/dzeX11 %i/bin install -m 755 cernlib/%v/bin/fatback %i/bin @@ -140,22 +128,6 @@ openmotif3-shlibs, %N (=%v-%r) << - Conflicts: << - cernlib2002-paw++, - cernlib2003-paw++, - cernlib-paw++ (<= 2003-22), - cernlib2005-paw++, - cernlib2005-g77-paw++, - cernlib2005-gfortran-paw++ - << - Replaces: << - cernlib2002-paw++, - cernlib2003-paw++, - cernlib-paw++ (<= 2003-22), - cernlib2005-paw++, - cernlib2005-g77-paw++, - cernlib2005-gfortran-paw++ - << InstallScript: << install -d %i/bin install -m 755 cernlib/%v/bin/paw++ %i/bin @@ -167,22 +139,6 @@ Package: %N-dev Provides: cernlib-dev Depends: %N (=%v-%r) - Conflicts: << - cernlib2002-dev, - cernlib2003-dev, - cernlib-dev (<= 2003-22), - cernlib2005-dev, - cernlib2005-g77-dev, - cernlib2005-gfortran-dev - << - Replaces: << - cernlib2002-dev, - cernlib2003-dev, - cernlib-dev (<= 2003-22), - cernlib2005-dev, - cernlib2005-g77-dev, - cernlib2005-gfortran-dev - << InstallScript: << install -d %i/lib install -m 644 cernlib/%v/lib/libgraflib.a %i/lib @@ -229,22 +185,6 @@ Package: %N-geant321 Provides: cernlib-geant321 Depends: %N-dev (=%v-%r) - Conflicts: << - cernlib2002-geant321, - cernlib2003-geant321, - cernlib-geant321 (<= 2003-22), - cernlib2005-geant321, - cernlib2005-g77-geant321, - cernlib2005-gfortran-geant321 - << - Replaces: << - cernlib2002-geant321, - cernlib2003-geant321, - cernlib-geant321 (<= 2003-22), - cernlib2005-geant321, - cernlib2005-g77-geant321, - cernlib2005-gfortran-geant321 - << InstallScript: << install -d %i/bin install -m 755 cernlib/%v/bin/gxint %i/bin @@ -265,22 +205,6 @@ Package: %N-mclibs Provides: cernlib-mclibs Depends: %N-dev (=%v-%r) - Conflicts: << - cernlib2002-mclibs, - cernlib2003-mclibs, - cernlib-mclibs (<= 2003-22), - cernlib2005-mclibs, - cernlib2005-g77-mclibs, - cernlib2005-gfortran-mclibs - << - Replaces: << - cernlib2002-mclibs, - cernlib2003-mclibs, - cernlib-mclibs (<= 2003-22), - cernlib2005-mclibs, - cernlib2005-g77-mclibs, - cernlib2005-gfortran-mclibs - << InstallScript: << install -d %i/lib install -m 644 cernlib/%v/lib/libariadne.a %i/lib ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs