[patch] fix_paths : new patch to fix patch reject

fix_paths.patch (text/plain), 14.70 KB, created by Vincent Hardy on 2009-03-11 07:26:47 UTC

diff -ur beid-2.6.0-orig/admin/generic.py beid-2.6.0/admin/generic.py
--- beid-2.6.0-orig/admin/generic.py	2006-06-20 15:19:59.000000000 +0200
+++ beid-2.6.0/admin/generic.py	2009-03-07 19:26:34.000000000 +0100
@@ -326,7 +326,7 @@
 		p('BOLD','* debug        ','debug=1 (-g) or debug=full (-g3, slower) else use environment CXXFLAGS, or -O by default')
 		p('BOLD','* prefix       ','the installation path')
 		p('BOLD','* extraincludes','a list of paths separated by ":"')
-		p('BOLD','* scons configure debug=full prefix=/usr/local extraincludes=/tmp/include:/usr/local')
+		p('BOLD','* scons configure debug=full prefix=____PREFIX____usr extraincludes=/tmp/include:____PREFIX____usr')
 		p('BOLD','* scons install prefix=/opt/local DESTDIR=/tmp/blah\n')
 		return
 	
diff -ur beid-2.6.0-orig/configure beid-2.6.0/configure
--- beid-2.6.0-orig/configure	2006-06-28 13:15:52.000000000 +0200
+++ beid-2.6.0/configure	2009-03-07 19:26:34.000000000 +0100
@@ -20,7 +20,7 @@
 	  echo -e $GREEN"not found!"$NORMAL
 	  echo "Please make sure that the Python interpreter is available in your PATH"
 	  echo "or invoke configure using the PYTHON flag, e.g."
-	  echo "$ PYTHON=/usr/local/bin/python configure"
+	  echo "$ PYTHON=/usr/bin/python configure"
 	  exit 1
 	fi
 	echo -e $GREEN"$PYTHON"$NORMAL
diff -ur beid-2.6.0-orig/README beid-2.6.0/README
--- beid-2.6.0-orig/README	2006-06-28 15:19:48.000000000 +0200
+++ beid-2.6.0/README	2009-03-07 19:26:34.000000000 +0100
@@ -13,18 +13,18 @@
 
 * After installation of this middleware you can test if the installation
   of the smart card reader was successfull:
-     /usr/local/bin/beid-tool -l
+     /usr/bin/beid-tool -l
   This should list the name(s) of your smart card reader(s).
 
 * To test the pkcs11 library, you can issue the following command:
-     /usr/local/bin/beid-pkcs11-tool -t -l --module /usr/local/lib/beidpkcs11.so
+     /usr/bin/beid-pkcs11-tool -t -l --module /usr/lib/libbeidpkcs11.so
   You will be asked to enter your PIN twice in a dialog box;
   afterwards you should enter 'x' twice on the command line,
   then the tool should print "No errors".
 
 * To register the pkcs11 library with Mozilla or Firefox (for authenticating to
   a web site and signing mails), you can load the html page
-        /usr/local/share/beid/beid-pkcs11-register.html
+        /usr/share/beid/beid-pkcs11-register.html
   into your browser (javascript must be enabled).
   For registration with Thunderbird, see the online documentation.
 
@@ -39,4 +39,4 @@
   
 * PKCS#11 PIN dialog boxes language:
 
-  In /usr/local/etc/beidbase.conf : force_language = fr (default = en, other languages: fr, nl or ger)
+  In /etc/beid/beidbase.conf : force_language = fr (default = en, other languages: fr, nl or ger)
diff -ur beid-2.6.0-orig/SConstruct beid-2.6.0/SConstruct
--- beid-2.6.0-orig/SConstruct	2006-06-28 13:12:04.000000000 +0200
+++ beid-2.6.0/SConstruct	2009-03-07 19:26:34.000000000 +0100
@@ -4,7 +4,7 @@
 clean      -> scons -c
 install    -> scons install
 uninstall  -> scons -c install
-configure  -> scons configure prefix=/tmp/ita debug=full extraincludes=/usr/local/include:/tmp/include prefix=/usr/local
+configure  -> scons configure prefix=/tmp/ita debug=full extraincludes=____PREFIX____usr/include:/tmp/include prefix=____PREFIX____usr
 
 Run from a subdirectory -> scons -u
 The variables are saved automatically after the first run (look at cache/kde.cache.py, ..)
@@ -16,7 +16,7 @@
 EnsureSConsVersion(0, 96)
 
 if os.path.isfile("/etc/debian_version"):
-    os.environ['QTDIR'] = "/usr/share/qt3"
+    os.environ['QTDIR'] = "/usr/share/qt4"
 
 env = Environment(tools=['default', 'generic', 'qt'], toolpath=['admin'])
 env['QT_LIB'] = 'qt-mt'
@@ -26,14 +26,14 @@
 
 # FIXME not for for 32 bit mandriva !
 if os.path.isfile("/etc/mandriva-release"):
-    # FIXME should remove /usr/lib/qt3/lib from path (now warning ...)
-    env.Append(LIBPATH=['/usr/lib/qt3/lib64'])
+    # FIXME should remove /usr/lib/qt4 from path (now warning ...)
+    env.Append(LIBPATH=['/usr/lib/qt4'])
 
-env['PREFIX'] = ARGUMENTS.get('prefix', '/usr/local')
-# FIXME: the confdir is hardcoded to /usr/local/etc, as is done in the sources
-#env['CONFDIR'] = ARGUMENTS.get('confdir', '/usr/local/etc')
-env['CONFDIR'] = '/usr/local/etc'
-env['LIBDIR'] = ARGUMENTS.get('libdir', '/usr/local/lib')
+env['PREFIX'] = ARGUMENTS.get('prefix', '____PREFIX____usr')
+# FIXME: the confdir is hardcoded to ____PREFIX____etc/beid, as is done in the sources
+#env['CONFDIR'] = ARGUMENTS.get('confdir', '____PREFIX____etc/beid')
+env['CONFDIR'] = '____PREFIX____etc/beid'
+env['LIBDIR'] = ARGUMENTS.get('libdir', '____PREFIX____usr/lib')
 
 def CheckPKGConfig(context, version):
      context.Message( 'Checking for pkg-config... ' )
diff -ur beid-2.6.0-orig/src/beidcommon/config.cpp beid-2.6.0/src/beidcommon/config.cpp
--- beid-2.6.0-orig/src/beidcommon/config.cpp	2006-07-03 06:04:52.000000000 +0200
+++ beid-2.6.0/src/beidcommon/config.cpp	2009-03-07 19:26:34.000000000 +0100
@@ -18,7 +18,7 @@
 
 
 /********** Harcoded config path **********/
-#define LINUX_CONF_PATH      "/usr/local/etc/"
+#define LINUX_CONF_PATH      "/etc/"
 
 
 #define CONFFILE_BEID "beidgui.conf"
diff -ur beid-2.6.0-orig/src/beidservicecrl/belgium.be-beidcrld beid-2.6.0/src/beidservicecrl/belgium.be-beidcrld
--- beid-2.6.0-orig/src/beidservicecrl/belgium.be-beidcrld	2006-06-29 11:01:31.000000000 +0200
+++ beid-2.6.0/src/beidservicecrl/belgium.be-beidcrld	2009-03-07 19:26:34.000000000 +0100
@@ -13,7 +13,7 @@
 #   See http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic-LSB-Core-generic/iniscrptfunc.html
 #
 # * You must adapt the DAEMON_FULLPATH variable to reflect the actual installation
-#   directory of the daemon. The default is set to /usr/local/bin
+#   directory of the daemon. The default is set to /usr/bin
 #   The variable is defined further down in this script.
 #
 #
@@ -110,7 +110,7 @@
 
 #
 # Set daemon specific information (adapt DAEMON_PATH to reflect your installation)
-DAEMON_PATH=/usr/local/bin	## standard location of the binary (do not include a trailing slash /)
+DAEMON_PATH=/usr/bin	## standard location of the binary (do not include a trailing slash /)
 				## the exact path depends the on prefix used when compiling the binary
 DAEMON_BINNAME=beidcrld	## name of the binary
 DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME"
diff -ur beid-2.6.0-orig/src/beidservicecrl/SConscript beid-2.6.0/src/beidservicecrl/SConscript
--- beid-2.6.0-orig/src/beidservicecrl/SConscript	2006-06-27 10:12:30.000000000 +0200
+++ beid-2.6.0/src/beidservicecrl/SConscript	2009-03-07 19:26:34.000000000 +0100
@@ -13,4 +13,4 @@
 prefix = env['PREFIX']
 initscript = 'belgium.be-beidcrld'
 env.Alias('install', env.Install(prefix + '/bin', obj.target))
-env.Alias('install', env.Install('/etc/init.d', initscript))
+env.Alias('install', env.Install('____PREFIX____etc/init.d', initscript))
diff -ur beid-2.6.0-orig/src/Belpic PCSC Service/belgium.be-beidpcscd beid-2.6.0/src/Belpic PCSC Service/belgium.be-beidpcscd
--- beid-2.6.0-orig/src/Belpic PCSC Service/belgium.be-beidpcscd	2006-06-29 11:01:30.000000000 +0200
+++ beid-2.6.0/src/Belpic PCSC Service/belgium.be-beidpcscd	2009-03-07 19:26:34.000000000 +0100
@@ -13,7 +13,7 @@
 #   See http://refspecs.freestandards.org/LSB_3.1.0/LSB-Core-generic-LSB-Core-generic/iniscrptfunc.html
 #
 # * You must adapt the DAEMON_FULLPATH variable to reflect the actual installation
-#   directory of the daemon. The default is set to /usr/local/bin
+#   directory of the daemon. The default is set to /usr/bin
 #   The variable is defined further down in this script.
 #
 #
@@ -115,7 +115,7 @@
 
 #
 # Set daemon specific information (adapt DAEMON_PATH to reflect your installation)
-DAEMON_PATH=/usr/local/bin	## standard location of the binary (do not include a trailing slash /)
+DAEMON_PATH=/usr/bin	## standard location of the binary (do not include a trailing slash /)
 				## the exact path depends the on prefix used when compiling the binary
 DAEMON_BINNAME=beidpcscd	## name of the binary
 DAEMON_FULLPATH="$DAEMON_PATH/$DAEMON_BINNAME"
diff -ur beid-2.6.0-orig/src/Belpic PCSC Service/SConscript beid-2.6.0/src/Belpic PCSC Service/SConscript
--- beid-2.6.0-orig/src/Belpic PCSC Service/SConscript	2006-06-27 10:12:11.000000000 +0200
+++ beid-2.6.0/src/Belpic PCSC Service/SConscript	2009-03-07 19:26:34.000000000 +0100
@@ -27,4 +27,4 @@
 prefix = env['PREFIX']
 initscript = 'belgium.be-beidpcscd'
 env.Alias('install', env.Install(prefix + '/bin', obj.target))
-env.Alias('install', env.Install('/etc/init.d', initscript))
+env.Alias('install', env.Install('____PREFIX____etc/init.d', initscript))
diff -ur beid-2.6.0-orig/src/eidlibjni/eidlibTest/README beid-2.6.0/src/eidlibjni/eidlibTest/README
--- beid-2.6.0-orig/src/eidlibjni/eidlibTest/README	2006-06-28 16:47:56.000000000 +0200
+++ beid-2.6.0/src/eidlibjni/eidlibTest/README	2009-03-07 19:26:34.000000000 +0100
@@ -8,4 +8,4 @@
 
 applet
 ------
-LD_LIBRARY_PATH=/usr/local/lib firefox BEIDCard.html
+LD_LIBRARY_PATH=/usr/lib firefox BEIDCard.html
diff -ur beid-2.6.0-orig/src/eidviewer/beidgui.conf beid-2.6.0/src/eidviewer/beidgui.conf
--- beid-2.6.0-orig/src/eidviewer/beidgui.conf	2006-05-18 16:05:41.000000000 +0200
+++ beid-2.6.0/src/eidviewer/beidgui.conf	2009-03-07 19:26:34.000000000 +0100
@@ -2,10 +2,10 @@
 
 [BEID_default]
 # The certificates directory (must exist)
-certs = /usr/local/share/beid/certs/
+certs = /usr/share/beid/certs/
 
 # The CRL directory (must exist)
-crl = /usr/local/share/beid/crl/
+crl = /usr/share/beid/crl/
 
 
 [CA_certs]
diff -ur beid-2.6.0-orig/src/eidviewer/beidgui.desktop beid-2.6.0/src/eidviewer/beidgui.desktop
--- beid-2.6.0-orig/src/eidviewer/beidgui.desktop	2006-06-22 14:58:23.000000000 +0200
+++ beid-2.6.0/src/eidviewer/beidgui.desktop	2009-03-07 19:26:34.000000000 +0100
@@ -7,10 +7,10 @@
 Comment=Display and administer your eID card
 Comment[nl]=Weergeven en beheren van uw eID kaart
 Comment[fr]=Affichage et gestion de votre carte eID
-Exec=/usr/local/bin/beidgui
+Exec=/usr/bin/beidgui
 Terminal=false
 MultipleArgs=false
 Type=Application
-Icon=/usr/local/bin/beidgui.png
+Icon=/usr/bin/beidgui.png
 Categories=Application
 
diff -ur beid-2.6.0-orig/src/eidviewer/eidviewerApp.cpp beid-2.6.0/src/eidviewer/eidviewerApp.cpp
--- beid-2.6.0-orig/src/eidviewer/eidviewerApp.cpp	2006-07-03 07:13:23.000000000 +0200
+++ beid-2.6.0/src/eidviewer/eidviewerApp.cpp	2009-03-07 19:26:34.000000000 +0100
@@ -109,7 +109,7 @@
         CFRelease(macPath);
 
         int i = 1;
-        static char *s = app_path; // "/usr/local/lib/libbelpicgui.dylib";
+        static char *s = app_path; // "/usr/lib/libbelpicgui.dylib";
         gMyApp = new QApplication(i, &s); 
 #endif
 }
diff -ur beid-2.6.0-orig/src/newpkcs11/config.h beid-2.6.0/src/newpkcs11/config.h
--- beid-2.6.0-orig/src/newpkcs11/config.h	2006-06-16 14:11:44.000000000 +0200
+++ beid-2.6.0/src/newpkcs11/config.h	2009-03-07 19:26:34.000000000 +0100
@@ -3,7 +3,7 @@
 
 
 /********** Hardcoded path to the config file **********/
-#define OPENSC_CONF_PATH "/usr/local/etc/beidbase.conf"
+#define OPENSC_CONF_PATH "/etc/beid/beidbase.conf"
 
 
 /* Enable debug messages. */
diff -ur beid-2.6.0-orig/src/newpkcs11/etc/beid-pkcs11-register.html beid-2.6.0/src/newpkcs11/etc/beid-pkcs11-register.html
--- beid-2.6.0-orig/src/newpkcs11/etc/beid-pkcs11-register.html	2006-07-03 08:10:38.000000000 +0200
+++ beid-2.6.0/src/newpkcs11/etc/beid-pkcs11-register.html	2009-03-07 19:26:34.000000000 +0100
@@ -83,9 +83,9 @@
 	}
 	else {
 		if (navigator.platform.indexOf("Mac") >= 0)
-			p11Lib = "/usr/local/lib/beid-pkcs11.bundle";
+			p11Lib = "/usr/lib/beid-pkcs11.bundle";
 		else if (navigator.platform.indexOf("Linux") >= 0)
-			p11Lib = "/usr/local/lib/libbeidpkcs11.so";
+			p11Lib = "/usr/lib/libbeidpkcs11.so";
 
 		res = pkcs11.addmodule(p11Name, p11Lib, 0, 0);
 
diff -ur beid-2.6.0-orig/src/newpkcs11/etc/Belgian_eID_PKCS11_java.cfg beid-2.6.0/src/newpkcs11/etc/Belgian_eID_PKCS11_java.cfg
--- beid-2.6.0-orig/src/newpkcs11/etc/Belgian_eID_PKCS11_java.cfg	2006-06-27 12:37:54.000000000 +0200
+++ beid-2.6.0/src/newpkcs11/etc/Belgian_eID_PKCS11_java.cfg	2009-03-07 19:26:34.000000000 +0100
@@ -1,3 +1,3 @@
 name = BelgianEID 
-library = /usr/local/lib/libbeidpkcs11.so
+library = /usr/lib/libbeidpkcs11.so
 
diff -ur beid-2.6.0-orig/src/newpkcs11/SConscript beid-2.6.0/src/newpkcs11/SConscript
--- beid-2.6.0-orig/src/newpkcs11/SConscript	2006-05-31 17:04:41.000000000 +0200
+++ beid-2.6.0/src/newpkcs11/SConscript	2009-03-07 19:26:34.000000000 +0100
@@ -11,5 +11,5 @@
 env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-register.html'))
 env.Alias('install', env.Install(prefix + '/share/beid', 'etc/beid-pkcs11-unregister.html'))
 env.Alias('install', env.Install(confdir, 'etc/beidbase.conf'))
-env.Alias('install', env.Install('/usr/local/lib/pkcs11/', 'etc/Belgian_eID_PKCS11_java.cfg'))
+env.Alias('install', env.Install('____PREFIX____usr/lib/pkcs11/', 'etc/Belgian_eID_PKCS11_java.cfg'))
 env.Alias('install', env.Install(prefix + '/include/beid', 'config.h'))
diff -ur beid-2.6.0-orig/src/newpkcs11/src/libopensc/card-belpic.c beid-2.6.0/src/newpkcs11/src/libopensc/card-belpic.c
--- beid-2.6.0-orig/src/newpkcs11/src/libopensc/card-belpic.c	2006-07-03 07:18:08.000000000 +0200
+++ beid-2.6.0/src/newpkcs11/src/libopensc/card-belpic.c	2009-03-07 19:26:34.000000000 +0100
@@ -958,7 +958,7 @@
     modgui = (void *)scdl_open("beidgui.dll");
 #elif defined (__APPLE__)
     /* QT complains if not full path given on Mac */
-    modgui = (void *)scdl_open("/usr/local/lib/libbeidgui.dylib");
+    modgui = (void *)scdl_open("/usr/lib/libbeidgui.dylib");
 #else
     modgui = (void *)scdl_open("libbeidgui.so");
 #endif
Seulement dans beid-2.6.0/src/newpkcs11/src/libopensc: card-belpic.c.orig
diff -ur beid-2.6.0-orig/src/newpkcs11/src/tools/opensc-tool.c beid-2.6.0/src/newpkcs11/src/tools/opensc-tool.c
--- beid-2.6.0-orig/src/newpkcs11/src/tools/opensc-tool.c	2006-07-03 08:10:06.000000000 +0200
+++ beid-2.6.0/src/newpkcs11/src/tools/opensc-tool.c	2009-03-07 19:26:34.000000000 +0100
@@ -369,7 +369,7 @@
         CFRelease(macPath);
 
         int i = 1;
-        static char *s = app_path; // "/usr/local/lib/libbelpicgui.dylib";
+        static char *s = app_path; // "/usr/lib/libbelpicgui.dylib";
         QApplication app(i, &s);
 #endif
 
diff -ur beid-2.6.0-orig/src/newpkcs11/src/tools/pkcs11-tool.c beid-2.6.0/src/newpkcs11/src/tools/pkcs11-tool.c
--- beid-2.6.0-orig/src/newpkcs11/src/tools/pkcs11-tool.c	2006-07-03 15:24:28.000000000 +0200
+++ beid-2.6.0/src/newpkcs11/src/tools/pkcs11-tool.c	2009-03-07 19:26:34.000000000 +0100
@@ -82,7 +82,7 @@
 static const char *	opt_input = NULL;
 static const char *	opt_output = NULL;
 #ifdef __APPLE__
-static const char *	opt_module = "/usr/local/lib/beid-pkcs11.bundle";
+static const char *	opt_module = "/usr/lib/beid-pkcs11.bundle";
 #else
 static const char *	opt_module = "libbeidpkcs11.so";
 #endif