[Uludag-commits] r16956 - in trunk/pisi: . pisi pisi/actionsapi

[uludag-commits at pardus.org.tr]

Author: faik
Date: Mon Feb  4 15:41:09 2008
New Revision: 16956

Added:
   trunk/pisi/python-2.5.patch
      - copied unchanged from r16924, trunk/pisi/python-2.5.patch
Modified:
   trunk/pisi/pisi/actionsapi/autotools.py
   trunk/pisi/pisi/archive.py
   trunk/pisi/pisi/configfile.py
Log:
Revert to revision 16924 to keep 2007 compatibility 
until a workable 2008 packages and environment is 
ready.



Modified: trunk/pisi/pisi/actionsapi/autotools.py
=================================================================
--- trunk/pisi/pisi/actionsapi/autotools.py	(original)
+++ trunk/pisi/pisi/actionsapi/autotools.py	Mon Feb  4 15:41:09 2008
@@ -26,7 +26,6 @@
 from pisi.actionsapi.shelltools import can_access_file
 from pisi.actionsapi.shelltools import unlink
 from pisi.actionsapi.libtools import gnuconfig_update
-from pisi.actionsapi.libtools import libtoolize
 
 class ConfigureError(pisi.actionsapi.Error):
     def __init__(self, value=''):
@@ -56,10 +55,6 @@
 
 def configure(parameters = ''):
     '''configure source with given parameters = "--with-nls --with-libusb --with-something-usefull"'''
-
-    if can_access_file('ltmain.sh'):
-        libtoolize("--copy --force")
-
     if can_access_file('configure'):
         gnuconfig_update()
 

Modified: trunk/pisi/pisi/archive.py
=================================================================
--- trunk/pisi/pisi/archive.py	(original)
+++ trunk/pisi/pisi/archive.py	Mon Feb  4 15:41:09 2008
@@ -19,7 +19,6 @@
 import tarfile
 import zipfile
 import gzip
-import struct
 
 import gettext
 __trans = gettext.translation('pisi', fallback=True)
@@ -213,23 +212,7 @@
                   "Attempt to read ZIP archive that was already closed"
         zinfo = self.getinfo(name)
         filepos = self.fp.tell()
-
-        self.fp.seek(zinfo.header_offset, 0)
-
-        # Skip the file header:
-        fheader = self.fp.read(30)
-        if fheader[0:4] != zipfile.stringFileHeader:
-            raise BadZipfile, "Bad magic number for file header"
-
-        fheader = struct.unpack(zipfile.structFileHeader, fheader)
-        fname = self.fp.read(fheader[zipfile._FH_FILENAME_LENGTH])
-        if fheader[zipfile._FH_EXTRA_FIELD_LENGTH]:
-            self.fp.read(fheader[zipfile._FH_EXTRA_FIELD_LENGTH])
-
-        if fname != zinfo.orig_filename:
-            raise zipfile.BadZipfile, \
-                  'File name in directory "%s" and header "%s" differ.' % (
-                zinfo.orig_filename, fname)
+        self.fp.seek(zinfo.file_offset, 0)
 
         destfile = file(outname, 'wb')
 

Modified: trunk/pisi/pisi/configfile.py
=================================================================
--- trunk/pisi/pisi/configfile.py	(original)
+++ trunk/pisi/pisi/configfile.py	Mon Feb  4 15:41:09 2008
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2005 - 2008, TUBITAK/UEKAE
+# Copyright (C) 2005 - 2007, TUBITAK/UEKAE
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
@@ -25,9 +25,9 @@
 #host = i686-pc-linux-gnu
 #generateDebug = False
 #jobs = "-j1"
-#CFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2
-#CXXFLAGS= -mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2
-#LDFLAGS= -Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu
+#CFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow
+#CXXFLAGS= -mtune=generic -mcpu=generic -march=i686 -O2 -pipe -fomit-frame-pointer -Wstrict-overflow
+#LDFLAGS=
 #buildno=True     # necessary for generating build nos
 #buildhelper = None / ccache / icecream
 #compressionlevel = 7
@@ -65,7 +65,7 @@
     destinationdirectory = "/"
     autoclean = False
     distribution = "Pardus"
-    distribution_release = "2008"
+    distribution_release = "2007"
     architecture = "i686"
     http_proxy = os.getenv("HTTP_PROXY") or None
     https_proxy = os.getenv("HTTPS_PROXY") or None
@@ -78,9 +78,9 @@
     host = "i686-pc-linux-gnu"
     jobs = "-j1"
     generateDebug = False
-    cflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2"
-    cxxflags = "-mtune=generic -march=i686 -O2 -pipe -fomit-frame-pointer -fstack-protector -D_FORTIFY_SOURCE=2"
-    ldflags = "-Wl,-O1 -Wl,-z,relro -Wl,--hash-style=gnu"
+    cflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer"
+    cxxflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer"
+    ldflags = ""
     buildno = False
     buildhelper = None
     compressionlevel = 7