Merge pull request #1095 from blue-devil/master

sqlite:ver bump and fix permissions

system/base/sqlite/actions.py

@@ -4,14 +4,14 @@
 # Licensed under the GNU General Public License, version 3.
 # See the file http://www.gnu.org/licenses/gpl.txt
 
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
-    # Use secure delete. Even if the data is deleted with sqlite query, the traces of the deleted data still remains in the file
+# Use secure delete. Even if the data is deleted with sqlite query, the traces of the deleted data still remains in the file
-    # but cannot be seen with sqlite query. However, it can be seen by opening the file with a text editor.
+# but cannot be seen with sqlite query. However, it can be seen by opening the file with a text editor.
-    # SQLITE_SECURE_DELETE overwrites written data with zeros.
+# SQLITE_SECURE_DELETE overwrites written data with zeros.
 def setup():
     pisitools.cflags.add("-DSQLITE_SECURE_DELETE=1",
                          "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1",
@@ -26,7 +26,8 @@ def setup():
                          "-DSQLITE_ENABLE_STMT_SCANSTATUS",
                          "-DSQLITE_SOUNDEX",
                          "-DSQLITE_ENABLE_RTREE",
-                         "-DSQLITE_ENABLE_API_ARMOR")
+                         "-DSQLITE_ENABLE_API_ARMOR",
+                         "-Wno-stringop-overflow")
 
     pisitools.cflags.sub("-O[s\d]", "-O3")
 
@@ -38,6 +39,8 @@ def setup():
                          --enable-rtree \
                          --enable-json1 \
                          --enable-threadsafe")
+    # fix unused direct dependency analysis
+    pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
 
     #shelltools.cd("tea")
     #autotools.configure(" \
@@ -56,16 +59,15 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    #shelltools.cd("%s/sqlite-autoconf-3110000/tea" % get.workDIR())
+    #shelltools.cd("%s/sqlite-autoconf-3110100/tea" % get.workDIR())
     #autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     pisitools.dodoc("README*")
 
-    shelltools.cd("%s/sqlite-doc-3300100" % get.workDIR())
+    shelltools.cd("%s/sqlite-doc-3310100" % get.workDIR())
-    shelltools.system("pwd")
-
-    pisitools.insinto("/usr/share/doc/sqlite", "../sqlite-doc-3300100/*")
 
+    pisitools.insinto("/usr/share/doc/sqlite", "../sqlite-doc-3310100/*")
+    """
     # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
     shelltools.system("find %s -type f -perm 755 -exec ls -lha {} \;" % get.installDIR())
     shelltools.system("find %s -type f -perm 755 -exec chmod 644 {} \;" % get.installDIR())
@@ -75,3 +77,4 @@ def install():
     shelltools.system("find %s -type f -name '.~*' -exec ls -lha {} \;" % get.installDIR())# /build/pkg/sqlite-doc/usr/share/doc/sqlite/images/fileformat/.~lock.indexpage.odg#
     shelltools.system("find %s -type d -name '.~*' -exec ls -lha {} \;" % get.installDIR())
     shelltools.system("find %s -name '.~*' -exec rm -f {} \;" % get.installDIR())
+    """

system/base/sqlite/pspec.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>sqlite</Name>
@@ -8,12 +8,14 @@
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
-        <License>as-is</License>
+        <PartOf>system.base</PartOf>
+        <License>custom</License>
         <IsA>library</IsA>
+        <IsA>app:console</IsA>
         <Summary>An SQL Database Engine in a C Library</Summary>
         <Description>SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine. Supports databases up to 2 terabytes in size.</Description>
-        <Archive sha1sum="8383f29d53fa1d4383e4c8eb3e087f2ed940a9e0" type="targz">https://sqlite.org/2019/sqlite-autoconf-3300100.tar.gz</Archive>
+        <Archive sha1sum="0c30f5b22152a8166aa3bebb0f4bc1f3e9cc508b" type="targz">https://sqlite.org/2020/sqlite-autoconf-3310100.tar.gz</Archive>
-        <Archive sha1sum="35b89685c2164a3d18ceeb23ab57f0e207894dad" type="zip">https://sqlite.org/2019/sqlite-doc-3300100.zip</Archive>
+        <Archive sha1sum="3b6241f788e568b6ae5a20b3630e67729860b2eb" type="zip">https://sqlite.org/2020/sqlite-doc-3310100.zip</Archive>
         <BuildDependencies>
             <Dependency>readline-devel</Dependency>
         </BuildDependencies>
@@ -21,6 +23,7 @@
 
     <Package>
         <Name>sqlite</Name>
+        <Summary>An SQL Database Engine in a C Library</Summary>
         <RuntimeDependencies>
             <Dependency>readline</Dependency>
         </RuntimeDependencies>
@@ -48,7 +51,6 @@
 
     <Package>
         <Name>sqlite-32bit</Name>
-        <Summary>sqlite-32bit için paylaşımlı kitaplıklar</Summary>
         <PartOf>emul32</PartOf>
         <Summary>32-bit shared libraries for sqlite</Summary>
         <BuildType>emul32</BuildType>
@@ -60,6 +62,16 @@
         </Files>
     </Package>
 
+    <Package>
+        <Name>sqlite-doc</Name>
+        <Summary>sqlite-doc, sqlite için doküman belgeleri</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">sqlite</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/share/doc/sqlite/</Path>
+        </Files>
+    </Package>
 
     <!--<Package>
         <Name>sqlite-tcl</Name>
@@ -92,18 +104,14 @@
         </Files>
     </Package>-->
 
-    <Package>
-        <Name>sqlite-doc</Name>
-        <Summary>sqlite-doc, sqlite için doküman belgeleri</Summary>
-        <RuntimeDependencies>
-            <Dependency>sqlite</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/share/doc/sqlite/</Path>
-        </Files>
-    </Package>
-
     <History>
+        <Update release="14">
+            <Date>2020-04-24</Date>
+            <Version>3.31.1</Version>
+            <Comment>Minor version bump.</Comment>
+            <Name>Blue Devil</Name>
+            <Email>bluedevil@sctzine.com</Email>
+        </Update>
         <Update release="13">
             <Date>2019-12-12</Date>
             <Version>3.30.1</Version>
@@ -196,4 +204,4 @@
             <Email>alihan@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
+</PISI>

system/base/sqlite/translations.xml

@@ -10,5 +10,18 @@
     <Package>
         <Name>sqlite-devel</Name>
         <Summary xml:lang="tr">sqlite için geliştirme dosyaları</Summary>
+        <Description xml:lang="tr">sqlite-devel, sqlite için geliştirme dosyalarını içerir.</Description>
     </Package>
-</PISI>
+
+    <Package>
+        <Name>sqlite-32bit</Name>
+        <Summary xml:lang="tr">sqlite için 32-bit paylaşımlı kitaplıklar</Summary>
+        <Description xml:lang="tr">sqlite-32bit, sqlite için 32-bit paylaşımlı kitaplıklar sunar.</Description>
+    </Package>
+
+    <Package>
+        <Name>sqlite-doc</Name>
+        <Summary xml:lang="tr">sqlite için belgelendirme dosyaları</Summary>
+        <Description xml:lang="tr">sqlite-doc, sqlite için belgelendirme dosyalarını içerir.</Description>
+    </Package>
+</PISI>