Skip to contentSkip to conversation

libldb: add earlier version

PATCH New Armin Kuster 1 participant 2 messages Apr 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libldb: add earlier version

This version does not have a dependacy on samba

---
 .../libldb/avoid-openldap-unless-wanted.patch      |  13 ++
 ...-import-target-module-while-cross-compile.patch |  58 +++++++
 recipes-support/libldb/libldb/options-1.3.1.patch  | 193 +++++++++++++++++++++
 recipes-support/libldb/libldb_1.3.1.bb             |  64 +++++++
 4 files changed, 328 insertions(+)
 create mode 100644 recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch
 create mode 100755 recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch
 create mode 100644 recipes-support/libldb/libldb/options-1.3.1.patch
 create mode 100644 recipes-support/libldb/libldb_1.3.1.bb
recipes-support/libldb/libldb/avoid-openldap-unless-wanted.patch new file +13 -0
new file mode 100644
index 0000000..8ab094f
@@ -0,0 +1,13 @@
+--- a/wscript	2015-11-18 12:43:33.000000000 +0100
++++ b/wscript	2015-11-18 12:46:25.000000000 +0100
+@@ -58,9 +58,7 @@
+     if conf.env.standalone_ldb:
+         conf.CHECK_XSLTPROC_MANPAGES()
+ 
+-        # we need this for the ldap backend
+-        if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'):
+-            conf.env.ENABLE_LDAP_BACKEND = True
++        conf.env.ENABLE_LDAP_BACKEND = False
+ 
+         # we don't want any libraries or modules to rely on runtime
+         # resolution of symbols
recipes-support/libldb/libldb/do-not-import-target-module-while-cross-compile.patch new file +58 -0

58 lines not on this page · raw message

recipes-support/libldb/libldb/options-1.3.1.patch new file +193 -0

193 lines not on this page · raw message

recipes-support/libldb/libldb_1.3.1.bb new file +64 -0

64 lines not on this page · raw message

Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 clamav runtime: add resolve.conf support

and ping test too

---
 lib/oeqa/runtime/cases/clamav.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
lib/oeqa/runtime/cases/clamav.py +28 -0
index fc77330..647861c 100644
@@ -1,6 +1,7 @@
 # Copyright (C) 2019 Armin Kuster <[email protected]>
 #
 import re
+from tempfile import mkstemp
 
 from oeqa.runtime.case import OERuntimeTestCase
 from oeqa.core.decorator.depends import OETestDepends
@@ -9,6 +10,20 @@ from oeqa.runtime.decorator.package import OEHasPackage
 
 class ClamavTest(OERuntimeTestCase):
 
+    @classmethod
+    def setUpClass(cls):
+        cls.tmp_fd, cls.tmp_path = mkstemp()
+        with os.fdopen(cls.tmp_fd, 'w') as f:
+            # use gooled public dns
+            f.write("nameserver 8.8.8.8")
+            f.write(os.linesep)
+            f.write("nameserver 8.8.4.4")
+            f.write(os.linesep)
+
+    @classmethod
+    def tearDownClass(cls):
+        os.remove(cls.tmp_path)
+
     @OEHasPackage(['clamav'])
     @OETestDepends(['ssh.SSHTest.test_ssh'])
     def test_freshclam_help(self):
@@ -18,6 +33,19 @@ class ClamavTest(OERuntimeTestCase):
         self.assertEqual(status, 0, msg = msg)
 
     @OETestDepends(['clamav.ClamavTest.test_freshclam_help'])
+    @OEHasPackage(['openssh-scp', 'dropbear'])
+    def test_ping_clamav_net(self):
+        dst = '/etc/resolv.conf'
+        self.tc.target.run('rm -f %s' % dst)
+        (status, output) = self.tc.target.copyTo(self.tmp_path, dst)
+        msg = 'File could not be copied. Output: %s' % output
+        self.assertEqual(status, 0, msg=msg)
+
+        status, output = self.target.run('ping -c 1 database.clamav.net')
+        msg = ('ping database.clamav.net failed: output is:\n%s' % output)
+        self.assertEqual(status, 0, msg = msg)
+
+    @OETestDepends(['clamav.ClamavTest.test_ping_clamav_net'])
     def test_freshclam_download(self):
         status, output = self.target.run('freshclam --show-progress')
         match = re.search('Database updated', output)
Signature · 1 line
2.7.4