[paketler-commits] r36083 - in devel/system/base/e2fsprogs: . files

paketler-commits at pardus.org.tr paketler-commits at pardus.org.tr
5 Ara 2007 Çar 22:11:15 EET


Author: cartman
Date: Wed Dec  5 22:11:15 2007
New Revision: 36083

Added:
   devel/system/base/e2fsprogs/files/CVE-2007-5497.patch
   devel/system/base/e2fsprogs/files/bug-4297.patch
   devel/system/base/e2fsprogs/files/e2fsprogs-1.36-makefile.patch
   devel/system/base/e2fsprogs/files/e2fsprogs-1.38-disconnected-inodes.patch
Removed:
   devel/system/base/e2fsprogs/files/e2fsprogs-1.38-locale.patch
   devel/system/base/e2fsprogs/files/e2fsprogs-1.38-tests-locale.patch
   devel/system/base/e2fsprogs/files/e2fsprogs-1.39-makefile.patch
   devel/system/base/e2fsprogs/files/e2fsprogs-1.39-parse-types.patch
   devel/system/base/e2fsprogs/files/e2fsprogs-1.39-util-strptime.patch
Modified:
   devel/system/base/e2fsprogs/actions.py
   devel/system/base/e2fsprogs/pspec.xml
Log:
sync with 2007, I know history looks garbled but devel is not built yet anyway

Modified: devel/system/base/e2fsprogs/actions.py
=================================================================
--- devel/system/base/e2fsprogs/actions.py	(original)
+++ devel/system/base/e2fsprogs/actions.py	Wed Dec  5 22:11:15 2007
@@ -1,9 +1,9 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2005,2006 TUBITAK/UEKAE
+# Copyright © 2005 TUBITAK/UEKAE
 # Licensed under the GNU General Public License, version 2.
-# See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+# See the file http://www.gnu.org/copyleft/gpl.txt.
 
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
@@ -15,32 +15,48 @@
     # Fix permission problems
     shelltools.chmod("/po/*.po", 0777)
     shelltools.chmod("config*", 0777)
-
+    
     shelltools.export("LDCONFIG", "/bin/true")
-    autotools.configure("--enable-dynamic-e2fsck \
-                         --enable-elf-shlibs \
-                         --disable-nls")
-
+    autotools.configure("--enable-dynamic-e2fsck --enable-elf-shlibs --enable-nls")
+    
 def build():
      # Parallel make sometimes fails
-    autotools.make("-j1 COMPILE_ET=compile_et")
+    autotools.make("-j1")
 
 def install():
-    # Evil e2fsprogs makefile -- I'll get you!
+    #evil e2fsprogs makefile -- I'll get you!
     autotools.rawInstall("DESTDIR=%s libdir=/zapme" % get.installDIR())
     pisitools.removeDir("/zapme")
 
     autotools.rawInstall("DESTDIR=%s" % get.installDIR(), "install-libs")
 
-    pisitools.domove("/usr/lib/", "/lib")
+    pisitools.dodoc("ChangeLog", "README", "RELEASE-NOTES", "SHLIBS", "e2fsck/ChangeLog", "e2fsck/CHANGES")
 
-    # No static libs
-    pisitools.remove("/lib/*.a")
+    pisitools.domove("/usr/lib/", "/lib")
+    pisitools.domove("/lib/*.a", "/usr/lib")
 
+    for file in shelltools.ls("%s/usr/lib/*.a" % get.installDIR()):
+        destination = file.replace(get.installDIR(), "")
+        destination = destination.split("/")[3]
+        # create new ldscript
+        libtools.gen_usr_ldscript(destination.replace(".a", ".so"))
+
+    # normalize evil symlinks
+    for link in shelltools.ls("%s/lib/*" % get.installDIR()):
+        if shelltools.isLink(link) and not shelltools.can_access_file(shelltools.realPath(link)):
+            source = shelltools.baseName(shelltools.realPath(link))
+            link = link.replace(get.installDIR(), "")
+            # remove old link
+            pisitools.remove(link)
+            # create new link
+            pisitools.dosym(source, link)
+           
     pisitools.domove("/usr/sbin/", "/sbin")
+
     pisitools.domove("/usr/bin/lsattr", "/bin")
     pisitools.domove("/usr/bin/chattr", "/bin")
     pisitools.domove("/usr/bin/uuidgen", "/bin")
+
     pisitools.domove("/sbin/mklost+found",  "/usr/sbin")
 
     # time to convert hard links/duplicates to symbolic links
@@ -57,8 +73,7 @@
     # copy compile_et & mk_cmds
     shelltools.copy("%s/lib/et/compile_et" % get.curDIR(), "%s/bin/" % get.installDIR())
     shelltools.copy("%s/lib/ss/mk_cmds" % get.curDIR(), "%s/bin/" % get.installDIR())
-
+    
     # Symlink com_err.h
     pisitools.dosym("/usr/include/et/com_err.h","/usr/include/com_err.h")
 
-    pisitools.dodoc("ChangeLog", "README", "RELEASE-NOTES", "SHLIBS", "e2fsck/ChangeLog", "e2fsck/CHANGES")

Modified: devel/system/base/e2fsprogs/pspec.xml
=================================================================
--- devel/system/base/e2fsprogs/pspec.xml	(original)
+++ devel/system/base/e2fsprogs/pspec.xml	Wed Dec  5 22:11:15 2007
@@ -12,18 +12,17 @@
         <IsA>app:console</IsA>
         <Summary>Standard EXT2 and EXT3 filesystem utilities</Summary>
         <Description>E2fsprogs provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3 filesystem with journaling support.</Description>
-        <Archive sha1sum="c2dad0c9bd76701eafe3804e2a7d072aa198f046" type="targz">mirrors://sourceforge/e2fsprogs/e2fsprogs-1.39.tar.gz</Archive>
+        <Archive sha1sum="aa8915fe43bc7cf5fba633df7041009ce9981551" type="targz">mirrors://sourceforge/e2fsprogs/e2fsprogs-1.38.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gettext</Dependency>
             <Dependency>texinfo</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch>e2fsprogs-1.38-tests-locale.patch</Patch>
-            <Patch level="1">e2fsprogs-1.38-locale.patch</Patch>
             <Patch level="1">e2fsprogs-1.32-mk_cmds-cosmetic.patch</Patch>
-            <Patch level="1">e2fsprogs-1.39-util-strptime.patch</Patch>
-            <Patch>e2fsprogs-1.39-makefile.patch</Patch>
-            <Patch>e2fsprogs-1.39-parse-types.patch</Patch>
+            <Patch>e2fsprogs-1.36-makefile.patch</Patch>
+            <Patch>e2fsprogs-1.38-disconnected-inodes.patch</Patch>
+            <Patch level="1">bug-4297.patch</Patch>
+            <Patch level="1">CVE-2007-5497.patch</Patch>
         </Patches>
     </Source>
 
@@ -33,11 +32,10 @@
             <Dependency>tcp-wrappers</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="config">/etc</Path>
+            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="executable">/bin</Path>
             <Path fileType="library">/lib</Path>
             <Path fileType="executable">/sbin</Path>
-            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="executable">/usr/sbin</Path>
             <Path fileType="doc">/usr/share/doc</Path>
@@ -51,17 +49,17 @@
     </Package>
 
     <History>
-        <Update release="6">
-            <Date>2006-12-31</Date>
-            <Version>1.39</Version>
-            <Comment>Version bump, disable nls as workaround of #4297</Comment>
-            <Name>S.Çağlar Onur</Name>
-            <Email>caglar at pardus.org.tr</Email>
+        <Update release="6" type="security">
+            <Date>2007-12-05</Date>
+            <Version>1.38</Version>
+            <Comment>Fix CVE-2007-5497</Comment>
+            <Name>İsmail Dönmez</Name>
+            <Email>ismail at pardus.org.tr</Email>
         </Update>
         <Update release="5">
-            <Date>2006-12-31</Date>
+            <Date>2007-07-03</Date>
             <Version>1.38</Version>
-            <Comment>Disable static libs</Comment>
+            <Comment>Fix #4297</Comment>
             <Name>İsmail Dönmez</Name>
             <Email>ismail at pardus.org.tr</Email>
         </Update>


Paketler-commits mesaj listesiyle ilgili daha fazla bilgi