Merge branch 'master' into new_eudev

pisi-index.xml.sha1sum

@@ -1 +1 @@
-48f3064573461efd3575e52600701f44e252833c
+393a6bbeb66b868d2a58cdfad6979c5fa7120bed

pisi-index.xml.xz.sha1sum

@@ -1 +1 @@
-48e2053893607de612e30d240d1cb8ecd893c48a
+ef3b7951dcfaaae7a8ea036b7cc01fcbcb5f7276

system/base/cpio/actions.py

@@ -27,8 +27,8 @@ def check():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.remove("/usr/share/man/man1/mt.1")
-    pisitools.removeDir("/usr/libexec")
-
+    pisitools.removeDir("/usr/share/man/man8")
+    #pisitools.removeDir("/usr/libexec")
+    
     pisitools.dodoc("ChangeLog", "NEWS", "README")
 

system/base/cpio/pspec.xml

@@ -12,9 +12,9 @@
         <IsA>app:console</IsA>
         <Summary>A file archival tool which can also read and write tar files</Summary>
         <Description>GNU cpio copies files into or out of a cpio or tar archive. The archive can be another file on the disk, a magnetic tape, or a pipe. GNU cpio supports the following archive formats: binary, old ASCII, new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 tar.</Description>
-        <Archive sha1sum="6f1934b0079dc1e85ddff89cabdf01adb3a74abb" type="tarbz2">mirrors://gnu/cpio/cpio-2.11.tar.bz2</Archive>
+        <Archive sha1sum="60358408c76db354f6716724c4bcbcb6e18ab642" type="tarbz2">mirrors://gnu/cpio/cpio-2.12.tar.bz2</Archive>
         <Patches>
-            <Patch level="1">cpio-2.7-svr4compat.patch</Patch>
+            <!--Patch level="1">cpio-2.7-svr4compat.patch</Patch-->
             <Patch level="1">cpio-2.9-exitCode.patch</Patch>
             <Patch level="1">CVE-2010-0624-rpatelib-overflow.patch</Patch>
         </Patches>
@@ -32,6 +32,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2016-01-03</Date>
+            <Version>2.12</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="3">
             <Date>2014-05-11</Date>
             <Version>2.11</Version>

system/base/eudev/actions.py

@@ -71,3 +71,6 @@ def install():
     pisitools.doman("man/*.5", "man/*.7", "man/*.8")
 
     pisitools.dodoc("README*", "NOTES")
+
+    # Add rules for mount storage
+    pisitools.insinto("/lib/udev/rules.d","rules/60-persistent-storage.rules")

system/base/eudev/files/10-flash-mounts.rules

@@ -0,0 +1,33 @@
+#!/bin/sh  
+# start at sdb to ignore the system hard drive  
+KERNEL!="sd[b-z]*", GOTO="exit"  
+ACTION=="add", PROGRAM!="/sbin/blkid %N", GOTO="exit"  
+
+# import some useful filesystem info as variables  
+IMPORT{program}="/sbin/blkid -o udev -p %N"  
+
+# get the label if present, otherwise assign one based on device/partition  
+ENV{ID_FS_LABEL}!="", ENV{dir_name}="%E{ID_FS_LABEL}"  
+ENV{ID_FS_LABEL}=="", ENV{dir_name}="flash_drive_%k"  
+
+# create the dir in /media and symlink it to /mnt  
+ACTION=="add", RUN+="/bin/mkdir -p '/media/%E{dir_name}'"  
+
+# global mount options  
+#ACTION=="add", ENV{mount_options}="relatime"  
+
+# filesystem-specific mount options (777/666 dir/file perms for vfat) 
+ACTION=="add",ENV{mount_options_vfat}="gid=100,dmask=000,fmask=111,utf8,flush,rw,noatime,users"
+
+# add device to /etc/fstab  
+#ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", RUN+="/bin/sed -i '$a\/dev/%k /media/%E{dir_name} vfat %E{mount_options_vfat} 0 0' /etc/fstab"  
+
+# mount device  
+ACTION=="add", ENV{ID_FS_TYPE}=="vfat|ntfs", RUN+="/bin/mount -t auto -o %E{mount_options_vfat} /dev/%k '/media/%E{dir_name}'"  
+
+# clean up after device removal  
+ACTION=="remove", ENV{dir_name}!="", RUN+="/bin/umount -l '/media/%E{dir_name}'", RUN+="/bin/rmdir '/media/%E{dir_name}'"  
+ACTION=="remove", ENV{ID_FS_TYPE}!="", RUN+="/bin/sed -i '/\/dev\/%k /d' /etc/fstab"  
+
+# exit  
+LABEL="exit" 

system/base/eudev/pspec.xml

@@ -64,6 +64,7 @@
         </Files>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/usr/lib/tmpfiles.d/udev.conf">tmpfiles.conf</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/lib/udev/rules.d/10-flash-mounts.rules">10-flash-mounts.rules</AdditionalFile>
         </AdditionalFiles>
         <Provides>
             <COMAR script="package.py">System.Package</COMAR>
@@ -119,10 +120,18 @@
     </Package>
 
     <History>
-        <Update release="6">
-            <Date>2015-12-23</Date>
+        <Update release="7">
+            <Date>2016-01-03</Date>
             <Version>3.1.5</Version>
             <Comment>Version bump.</Comment>
+            <Comment>Add rules for mount storage.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="6">
+            <Date>2016-01-03</Date>
+            <Version>3.1.2</Version>
+            <Comment>Add rules for mount storage.</Comment>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
         </Update>

system/base/mudur/pspec.xml

@@ -25,7 +25,7 @@
     <Package>
         <Name>mudur</Name>
         <RuntimeDependencies>
-            <Dependency release="7">kbd</Dependency>
+            <Dependency versionFrom="2.0.3">kbd</Dependency>
             <Dependency>bash</Dependency>
             <Dependency>dbus</Dependency>
             <Dependency>kmod</Dependency>
@@ -62,7 +62,7 @@
 
     <History>
         <Update release="17">
-            <Date>2015-05-13</Date>
+            <Date>2016-01-03</Date>
             <Version>4.4.0</Version>
             <Comment>fix issue #562, rebuild, depend new kbd and eudev, mount cgroups</Comment>
             <Name>Marcin Bojara</Name>